From a45851b1ed25947afe5631d0335afa9ce1046cd18497395d6e47838fd4ac9bd2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 24 Nov 2014 10:08:35 +0000 Subject: [PATCH] Accepting request 262302 from X11:lxde Fixed license tag OBS-URL: https://build.opensuse.org/request/show/262302 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxqt-panel?expand=0&rev=1 --- .gitattributes | 23 +++++ .gitignore | 1 + lxqt-panel-0.8.0.tar.xz | 3 + lxqt-panel-0.8.0_fix_lxqt-mount_headers.patch | 48 ++++++++++ ...-panel-0.8.0_fix_undefined_reference.patch | 66 +++++++++++++ lxqt-panel.changes | 78 ++++++++++++++++ lxqt-panel.spec | 92 +++++++++++++++++++ 7 files changed, 311 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 lxqt-panel-0.8.0.tar.xz create mode 100644 lxqt-panel-0.8.0_fix_lxqt-mount_headers.patch create mode 100644 lxqt-panel-0.8.0_fix_undefined_reference.patch create mode 100644 lxqt-panel.changes create mode 100644 lxqt-panel.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/lxqt-panel-0.8.0.tar.xz b/lxqt-panel-0.8.0.tar.xz new file mode 100644 index 0000000..e66a800 --- /dev/null +++ b/lxqt-panel-0.8.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c453372bf6d35f09400788f6dece1403b63e7cf25abe62066fc9e82c5170b78 +size 259284 diff --git a/lxqt-panel-0.8.0_fix_lxqt-mount_headers.patch b/lxqt-panel-0.8.0_fix_lxqt-mount_headers.patch new file mode 100644 index 0000000..ced2e50 --- /dev/null +++ b/lxqt-panel-0.8.0_fix_lxqt-mount_headers.patch @@ -0,0 +1,48 @@ +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 + #include +-#include ++#include + + 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 ++#include + #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 + #include "menudiskitem.h" +-#include ++#include + #include + #include + #include +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 + #include + #include +-#include ++#include + #include "menudiskitem.h" + #include "popup.h" + diff --git a/lxqt-panel-0.8.0_fix_undefined_reference.patch b/lxqt-panel-0.8.0_fix_undefined_reference.patch new file mode 100644 index 0000000..bb48df6 --- /dev/null +++ b/lxqt-panel-0.8.0_fix_undefined_reference.patch @@ -0,0 +1,66 @@ +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); + diff --git a/lxqt-panel.changes b/lxqt-panel.changes new file mode 100644 index 0000000..ed60fab --- /dev/null +++ b/lxqt-panel.changes @@ -0,0 +1,78 @@ +------------------------------------------------------------------- +Wed Nov 19 12:49:32 UTC 2014 - andrea@opensuse.org + +- fixed license tag + +------------------------------------------------------------------- +Thu Nov 13 10:03:44 UTC 2014 - andrea@opensuse.org + +- added lxmenu-data + +------------------------------------------------------------------- +Sat Oct 25 11:39:08 UTC 2014 - andrea@opensuse.org + +- new upstream version 0.8.0 + +------------------------------------------------------------------- +Fri Oct 3 17:44:42 UTC 2014 - sfalken@opensuse.org + +- Added: + * 0001-fix_plugin_mount.patch + * 0002-fix_plugin_volume.patch + * 0003-fix_plugin_worldclock.patch + * 0004-fix_plugin_kbindicator.patch + * 0005-fix_plugin_dom.patch + * Patches added to fix buildfailure caused by undefined references, and new default build flags in cmake (gh#lxde/lxde-qt#288) + +------------------------------------------------------------------- +Tue May 13 19:36:50 UTC 2014 - andrea@opensuse.org + +- Build all plugins adding sensors and libstatgrab to buildrequires + +------------------------------------------------------------------- +Tue May 13 19:09:36 UTC 2014 - andrea@opensuse.org + +- spec file clean up for factoy + +------------------------------------------------------------------- +Tue May 13 17:15:03 UTC 2014 - sfalken@opensuse.org + +- Specfile cleanup + +------------------------------------------------------------------- +Mon May 12 16:18:22 UTC 2014 - sfalken@opensuse.org + +- Removed fedora spec, split into subproject + Del: lxqt-panel-Fedora_20.spec + +------------------------------------------------------------------- +Sat May 10 21:17:12 UTC 2014 - sfalken@opensuse.org + +- Ran spec-cleaner on openSUSE specfile + +------------------------------------------------------------------- +Sat May 10 01:07:08 UTC 2014 - sfalken@opensuse.org + +- Added specfile for Fedora_20 + Add: lxqt-panel-Fedora_20.spec + +------------------------------------------------------------------- +Fri May 9 16:32:14 UTC 2014 - sfalken@opensuse.org + +- Added tarball for new stable release + Add: lxqt-panel-0.7.0.tar.xz + Del: _service + +------------------------------------------------------------------- +Mon Apr 7 15:48:38 UTC 2014 - sfalken@opensuse.org + +- Changed Requires: lxqt-globalkeys-devel to lxwt-globalkeys + +------------------------------------------------------------------- +Wed Apr 2 15:18:01 UTC 2014 - sfalken@opensuse.org + +- Initial Source Upload + Add: _service + Add: lxqt-panel.spec + Add: lxqt-panel.changes + diff --git a/lxqt-panel.spec b/lxqt-panel.spec new file mode 100644 index 0000000..312ac7f --- /dev/null +++ b/lxqt-panel.spec @@ -0,0 +1,92 @@ +# +# spec file for package lxqt-panel +# +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: lxqt-panel +Version: 0.8.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 +BuildRequires: cmake +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: libsensors4-devel +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(libmenu-cache) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libstatgrab) +BuildRequires: pkgconfig(lxqt-qt5) >= 0.8.0 +BuildRequires: pkgconfig(lxqt-globalkeys-qt5) +BuildRequires: pkgconfig(lxqtmount-qt5) >= 0.8.0 +BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0 +BuildRequires: pkgconfig(sysstat-qt5) +BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xrender) +Requires: menu-cache +Requires: lxmenu-data +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Brand new desktop Panel for LXDE-Qt + +%package devel +Summary: Devel files for lxqt-panel +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} + +%description devel +Lxqt panel development files and headers + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +%build +%cmake -DUSE_QT5=ON +%__make %{?_smp_mflags} + +%install +%cmake_install +%fdupes -s %{buildroot}/%{_datadir} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc AUTHORS COPYING +%{_bindir}/%{name} +%dir %{_sysconfdir}/xdg/ +%dir %{_sysconfdir}/xdg/lxqt +%config %{_sysconfdir}/xdg/lxqt/panel.conf +%{_libdir}/%{name} +%{_datadir}/lxqt +%{_datadir}/lxqt-qt5 + +%files devel +%defattr(-,root,root) +%{_includedir}/lxqt + +%changelog