Stephan Kulow 2015-02-16 20:08:20 +00:00 committed by Git OBS Bridge
parent 329cbe07dd
commit 27643b8566
6 changed files with 34 additions and 130 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c453372bf6d35f09400788f6dece1403b63e7cf25abe62066fc9e82c5170b78
size 259284

View File

@ -1,48 +0,0 @@
diff -uNr old-lxqt-panel-0.8.0/plugin-mount/actions/deviceaction.h lxqt-panel-0.8.0/plugin-mount/actions/deviceaction.h
--- old-lxqt-panel-0.8.0/plugin-mount/actions/deviceaction.h 2014-10-26 11:09:10.294777261 +0100
+++ lxqt-panel-0.8.0/plugin-mount/actions/deviceaction.h 2014-10-26 11:12:41.252764945 +0100
@@ -31,7 +31,7 @@
#include <QObject>
#include <QSettings>
-#include <LXQtMount/Mount>
+#include <lxqtmount-qt5/LXQtMount/Mount>
namespace {
class MountDevice;
diff -uNr old-lxqt-panel-0.8.0/plugin-mount/lxqtmountplugin.cpp lxqt-panel-0.8.0/plugin-mount/lxqtmountplugin.cpp
--- old-lxqt-panel-0.8.0/plugin-mount/lxqtmountplugin.cpp 2014-10-26 11:09:10.294777261 +0100
+++ lxqt-panel-0.8.0/plugin-mount/lxqtmountplugin.cpp 2014-10-26 11:10:03.142774175 +0100
@@ -28,7 +28,7 @@
#include "lxqtmountplugin.h"
#include "lxqtmountconfiguration.h"
-#include <LXQtMount/Mount>
+#include <lxqtmount-qt5/LXQtMount/Mount>
#include "actions/deviceaction.h"
#include "popup.h"
#include "mountbutton.h"
diff -uNr old-lxqt-panel-0.8.0/plugin-mount/menudiskitem.cpp lxqt-panel-0.8.0/plugin-mount/menudiskitem.cpp
--- old-lxqt-panel-0.8.0/plugin-mount/menudiskitem.cpp 2014-10-26 11:09:10.298777261 +0100
+++ lxqt-panel-0.8.0/plugin-mount/menudiskitem.cpp 2014-10-26 11:14:07.573759906 +0100
@@ -27,7 +27,7 @@
#include <QDesktopServices>
#include "menudiskitem.h"
-#include <LXQtMount/Mount>
+#include <lxqtmount-qt5/LXQtMount/Mount>
#include <XdgIcon>
#include <QDebug>
#include <QUrl>
diff -uNr old-lxqt-panel-0.8.0/plugin-mount/popup.cpp lxqt-panel-0.8.0/plugin-mount/popup.cpp
--- old-lxqt-panel-0.8.0/plugin-mount/popup.cpp 2014-10-26 11:09:10.294777261 +0100
+++ lxqt-panel-0.8.0/plugin-mount/popup.cpp 2014-10-26 11:17:23.411748473 +0100
@@ -29,7 +29,7 @@
#include <QGridLayout>
#include <QLabel>
#include <QDesktopWidget>
-#include <LXQtMount/Mount>
+#include <lxqtmount-qt5/LXQtMount/Mount>
#include "menudiskitem.h"
#include "popup.h"

View File

@ -1,66 +0,0 @@
diff -uNr old-lxqt-panel-0.8.0/plugin-kbindicator/lxqtkbindicatorconfiguration.h lxqt-panel-0.8.0/plugin-kbindicator/lxqtkbindicatorconfiguration.h
--- old-lxqt-panel-0.8.0/plugin-kbindicator/lxqtkbindicatorconfiguration.h 2014-10-13 17:27:26.000000000 +0200
+++ lxqt-panel-0.8.0/plugin-kbindicator/lxqtkbindicatorconfiguration.h 2014-10-29 23:01:02.901587414 +0100
@@ -50,13 +50,6 @@
public slots:
void saveSettings();
- void selectColour(const QString &);
- void on_typeCOB_currentIndexChanged(int);
- void on_sourceCOB_currentIndexChanged(int);
- void on_maximumHS_valueChanged(int);
- void on_fontB_clicked();
-
-
private:
Ui::LxQtKbIndicatorConfiguration *ui;
QSettings *mSettings;
diff -uNr old-lxqt-panel-0.8.0/plugin-mount/CMakeLists.txt lxqt-panel-0.8.0/plugin-mount/CMakeLists.txt
--- old-lxqt-panel-0.8.0/plugin-mount/CMakeLists.txt 2014-10-13 17:27:26.000000000 +0200
+++ lxqt-panel-0.8.0/plugin-mount/CMakeLists.txt 2014-10-29 23:01:02.901587414 +0100
@@ -14,6 +14,7 @@
)
set(SOURCES
+ ${PROJECT_SOURCE_DIR}/panel/lxqtpanelpluginconfigdialog.cpp
lxqtmountplugin.cpp
mountbutton.cpp
menudiskitem.cpp
@@ -26,6 +27,7 @@
)
set(MOCS
+ ${PROJECT_SOURCE_DIR}/panel/lxqtpanelpluginconfigdialog.h
lxqtmountplugin.h
mountbutton.h
menudiskitem.h
diff -uNr old-lxqt-panel-0.8.0/plugin-volume/CMakeLists.txt lxqt-panel-0.8.0/plugin-volume/CMakeLists.txt
--- old-lxqt-panel-0.8.0/plugin-volume/CMakeLists.txt 2014-10-13 17:27:26.000000000 +0200
+++ lxqt-panel-0.8.0/plugin-volume/CMakeLists.txt 2014-10-29 23:01:02.901587414 +0100
@@ -13,6 +13,7 @@
)
set(SOURCES
+ ${PROJECT_SOURCE_DIR}/panel/lxqtpanelpluginconfigdialog.cpp
lxqtvolume.cpp
volumebutton.cpp
volumepopup.cpp
@@ -23,6 +24,7 @@
)
set(MOCS
+ ${PROJECT_SOURCE_DIR}/panel/lxqtpanelpluginconfigdialog.h
lxqtvolume.h
volumebutton.h
volumepopup.h
diff -uNr old-lxqt-panel-0.8.0/plugin-worldclock/lxqtworldclock.h lxqt-panel-0.8.0/plugin-worldclock/lxqtworldclock.h
--- old-lxqt-panel-0.8.0/plugin-worldclock/lxqtworldclock.h 2014-10-13 17:27:26.000000000 +0200
+++ lxqt-panel-0.8.0/plugin-worldclock/lxqtworldclock.h 2014-10-29 23:01:02.901587414 +0100
@@ -74,7 +74,6 @@
QDialog *configureDialog();
private slots:
- void synchroTimeout();
void timeout();
void wheelScrolled(int);

3
lxqt-panel-0.9.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:96b2c2f1b7de7605ac79f094936e6fcf8f0034342e11d84624a033f2450f6bf1
size 277840

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Feb 9 22:39:02 UTC 2015 - sfalken@opensuse.org
- New upstream version 0.9.0
- Added -lang subpackage
- Dropped Patches:
+ lxqt-panel-0.8.0_fix_lxqt-mount_headers.patch
+ lxqt-panel-0.8.0_fix_undefined_reference.patch
-------------------------------------------------------------------
Mon Jan 26 00:59:25 UTC 2015 - sfalken@opensuse.org

View File

@ -17,32 +17,33 @@
Name: lxqt-panel
Version: 0.8.0
Version: 0.9.0
Release: 0
Summary: Desktop Panel for LXDE-Qt
License: GPL-2.0+
Group: System/GUI/LXDE-Qt
Url: http://www.lxde.org
Source0: %{name}-%{version}.tar.xz
Patch0: %{name}-%{version}_fix_lxqt-mount_headers.patch
Patch1: %{name}-%{version}_fix_undefined_reference.patch
Source0: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: kguiaddons-devel
BuildRequires: kwindowsystem-devel
BuildRequires: libsensors4-devel
BuildRequires: xcb-util-devel
BuildRequires: pkgconfig(Qt5UiTools)
BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(libmenu-cache)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libstatgrab)
BuildRequires: pkgconfig(lxqt-globalkeys-qt5)
BuildRequires: pkgconfig(lxqt-qt5) >= 0.8.0
BuildRequires: pkgconfig(lxqtmount-qt5) >= 0.8.0
BuildRequires: pkgconfig(lxqt) >= %{version}
BuildRequires: pkgconfig(lxqt-globalkeys) >= %{version}
BuildRequires: pkgconfig(lxqtmount) >= %{version}
BuildRequires: pkgconfig(sysstat-qt5)
BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(Qt5UiTools)
Requires: lxmenu-data
Requires: menu-cache
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -58,16 +59,21 @@ Requires: %{name} = %{version}
%description devel
Lxqt panel development files and headers
%package -n %{name}-lang
Summary: Translations for lxqt-panel
Group: System/GUI/LXDE-Qt
Requires: %{name} = %{version}
%description -n %{name}-lang
Translation files for lxqt-panel
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
mkdir build
pushd build
cmake \
-DUSE_QT5=ON \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
..
%__make %{?_smp_mflags}
@ -91,11 +97,14 @@ popd
%dir %{_sysconfdir}/xdg/lxqt
%config %{_sysconfdir}/xdg/lxqt/panel.conf
%{_libdir}/%{name}
%{_datadir}/lxqt
%{_datadir}/lxqt-qt5
%{_datadir}/lxqt/lxqt-panel
%files devel
%defattr(-,root,root)
%{_includedir}/lxqt
%files -n %{name}-lang
%defattr(-,root,root)
%{_datadir}/lxqt/translations
%changelog