[packages/matchbox-panel] - new URLs, updated to 2.0 - removed outdated desktop,gcc4,libm patches - added format patch (fixes
qboosh
qboosh at pld-linux.org
Sun Jan 27 17:58:05 CET 2019
commit 3259e2b8f53d1b3c46e2405c0f2e2bf6255efc22
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jan 27 18:03:10 2019 +0100
- new URLs, updated to 2.0
- removed outdated desktop,gcc4,libm patches
- added format patch (fixes build with -Werror=format-security)
- added no-Werror patch (disable -Werror, there are some deprecations)
- added conflicting patch (rename conflicting sync() function name)
- no more wireless applet; battery applet now uses libacpi or apmd
libm.patch | 11 ----
matchbox-panel-conflicting.patch | 29 ++++++++++
matchbox-panel-desktop.patch | 98 ----------------------------------
matchbox-panel-format.patch | 11 ++++
matchbox-panel-gcc4.patch | 11 ----
matchbox-panel-no-Werror.patch | 62 ++++++++++++++++++++++
matchbox-panel.spec | 112 ++++++++++++++++++++++-----------------
7 files changed, 164 insertions(+), 170 deletions(-)
---
diff --git a/matchbox-panel.spec b/matchbox-panel.spec
index 171cc8f..f6598bd 100644
--- a/matchbox-panel.spec
+++ b/matchbox-panel.spec
@@ -1,27 +1,37 @@
#
# Conditional build:
-%bcond_with sn # startup-notification support
-%bcond_without wifi # wireless applet
+%bcond_without sn # startup-notification support
+%bcond_without acpi # battery applet using ACPI
+%bcond_with apm # battery applet using APM
#
+%if %{with apm}
+%undefine with_acpi
+%endif
Summary: Matchbox Panel
Summary(pl.UTF-8): Panel dla środowiska Matchbox
Name: matchbox-panel
-Version: 0.9.3
-Release: 2
+Version: 2.0
+Release: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.9/%{name}-%{version}.tar.bz2
-# Source0-md5: 56d1807636f3919e22e51896ab7ccd2e
-Patch0: %{name}-desktop.patch
-Patch1: %{name}-gcc4.patch
-Patch2: libm.patch
-URL: http://projects.o-hand.com/matchbox/
+Source0: http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/2.0/%{name}-%{version}.tar.bz2
+# Source0-md5: 87faf3b9299a9d04056904e6f311ec80
+Patch0: %{name}-format.patch
+Patch1: %{name}-no-Werror.patch
+Patch2: %{name}-conflicting.patch
+URL: https://www.yoctoproject.org/software-item/matchbox/
+%{?with_apm:BuildRequires: apmd-devel}
+BuildRequires: autoconf >= 2.53
+BuildRequires: automake
+BuildRequires: dbus-glib-devel
BuildRequires: gettext-tools
-%{?with_wifi:BuildRequires: libiw-devel}
-BuildRequires: libmatchbox-devel >= 1.6
+BuildRequires: glib2-devel >= 2.0
+BuildRequires: gtk+2-devel >= 2:2.6
+%{?with_acpi:BuildRequires: libacpi-devel}
BuildRequires: pkgconfig
%{?with_sn:BuildRequires: startup-notification-devel}
-Requires: libmatchbox >= 1.6
+Requires: gtk+2 >= 2:2.6
+Obsoletes: matchbox-panel-wireless < 2.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -30,17 +40,19 @@ Matchbox Panel.
%description -l pl.UTF-8
Panel dla środowiska Matchbox.
-%package wireless
-Summary: Panel based wireless monitor
-Summary(pl.UTF-8): Siedzący w panelu monitor sieci bezprzewodowej
-Group: X11/Applications
-Requires: %{name} = %{version}-%{release}
+%package devel
+Summary: Header files for Matchbox Panel applets development
+Summary(pl.UTF-8): Pliki nagłówkowe do tworzenia apletów panelu środowiska Matchbox
+Group: X11/Development/Libraries
+Requires: glib2-devel >= 2.0
+Requires: gtk+2-devel >= 2:2.6
+# doesn't require base
-%description wireless
-Panel based wireless monitor.
+%description devel
+Header files for Matchbox Panel applets development.
-%description wireless -l pl.UTF-8
-Siedzący w panelu monitor sieci bezprzewodowej.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe do tworzenia apletów panelu środowiska Matchbox.
%prep
%setup -q
@@ -55,10 +67,11 @@ Siedzący w panelu monitor sieci bezprzewodowej.
%{__autoheader}
%{__automake}
%configure \
- --enable-acpi-linux \
- --enable-dnotify \
--enable-nls \
- %{?with_sn:--enable-startup-notification}
+ %{?with_sn:--enable-startup-notification} \
+%if %{with acpi} || %{with apm}
+ --with-battery=%{?with_acpi:acpi}%{?with_apm:apm}
+%endif
%{__make}
%install
@@ -67,38 +80,37 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-# not installed if built with acpi instead of apm
-install applets/dotdesktop/mb-applet-battery.desktop $RPM_BUILD_ROOT%{_desktopdir}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/matchbox-panel/*.la
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{es_ES,es}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{fi_FI,fi}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{fr_FR,fr}
-
-%find_lang %{name}
+# no translations included in 2.0
+#find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f %{name}.lang
+%files
+# -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README
%attr(755,root,root) %{_bindir}/matchbox-panel
-%attr(755,root,root) %{_bindir}/mb-applet-xterm-wrapper.sh
-%attr(755,root,root) %{_bindir}/mb-applet-battery
-%attr(755,root,root) %{_bindir}/mb-applet-clock
-%attr(755,root,root) %{_bindir}/mb-applet-menu-launcher
-%attr(755,root,root) %{_bindir}/mb-applet-launcher
-%attr(755,root,root) %{_bindir}/mb-applet-system-monitor
-%{_desktopdir}/mb-applet-battery.desktop
-%{_desktopdir}/mb-applet-clock.desktop
-%{_desktopdir}/mb-applet-menu-launcher.desktop
-%{_desktopdir}/mb-applet-system-monitor.desktop
-%{_desktopdir}/mb-launcher-term.desktop
-%{_pixmapsdir}/*.png
+%dir %{_libdir}/matchbox-panel
+%attr(755,root,root) %{_libdir}/matchbox-panel/libbattery.so
+%attr(755,root,root) %{_libdir}/matchbox-panel/libbrightness.so
+%attr(755,root,root) %{_libdir}/matchbox-panel/libclock.so
+%attr(755,root,root) %{_libdir}/matchbox-panel/liblauncher.so
+%attr(755,root,root) %{_libdir}/matchbox-panel/libnotify.so
+%attr(755,root,root) %{_libdir}/matchbox-panel/libshowdesktop.so
+%if %{with sn}
+%attr(755,root,root) %{_libdir}/matchbox-panel/libstartup.so
+%attr(755,root,root) %{_libdir}/matchbox-panel/libstartup-notify.so
+%endif
+%attr(755,root,root) %{_libdir}/matchbox-panel/libsystray.so
+%attr(755,root,root) %{_libdir}/matchbox-panel/libwindowselector.so
+%dir %{_datadir}/matchbox-panel
+%{_datadir}/matchbox-panel/brightness
+%{_datadir}/matchbox-panel/startup
-%if %{with wifi}
-%files wireless
+%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mb-applet-wireless
-%{_desktopdir}/mb-applet-wireless.desktop
-%endif
+%{_includedir}/matchbox-panel
+%{_pkgconfigdir}/matchbox-panel.pc
diff --git a/libm.patch b/libm.patch
deleted file mode 100644
index c42c6e7..0000000
--- a/libm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- matchbox-panel-0.9.3/applets/Makefile.am~ 2005-10-03 00:06:58.000000000 +0200
-+++ matchbox-panel-0.9.3/applets/Makefile.am 2015-11-22 00:47:12.783853175 +0100
-@@ -38,7 +38,7 @@
- mb_applet_clock_SOURCES = mb-applet-clock.c
- mb_applet_menu_launcher_SOURCES = mb-applet-menu-launcher.c
- mb_applet_wireless_SOURCES = mb-applet-wireless.c
--mb_applet_wireless_LDADD = $(LIBMB_LIBS) $(SN_LIBS) $(WIRELESS_LIBS)
-+mb_applet_wireless_LDADD = $(LIBMB_LIBS) $(SN_LIBS) $(WIRELESS_LIBS) -lm
- mb_applet_launcher_SOURCES = mb-applet-launcher.c
- mb_applet_system_monitor_SOURCES = mb-applet-system-monitor.c
-
diff --git a/matchbox-panel-conflicting.patch b/matchbox-panel-conflicting.patch
new file mode 100644
index 0000000..ddb1ea6
--- /dev/null
+++ b/matchbox-panel-conflicting.patch
@@ -0,0 +1,29 @@
+--- matchbox-panel-2.0/applets/showdesktop/showdesktop.c.orig 2008-06-19 18:08:19.000000000 +0200
++++ matchbox-panel-2.0/applets/showdesktop/showdesktop.c 2019-01-27 10:22:16.578479555 +0100
+@@ -57,7 +57,7 @@
+
+ /* Sync @applet with the _NET_SHOWING_DESKTOP root window property */
+ static void
+-sync (ShowDesktopApplet *applet)
++sync_applet (ShowDesktopApplet *applet)
+ {
+ GdkDisplay *display;
+ Atom type;
+@@ -103,7 +103,7 @@
+ if (xev->type == PropertyNotify) {
+ if (xev->xproperty.atom == applet->atom) {
+ /* _NET_SHOWING_DESKTOP changed */
+- sync (applet);
++ sync_applet (applet);
+ }
+ }
+
+@@ -145,7 +145,7 @@
+ applet);
+
+ /* Sync */
+- sync (applet);
++ sync_applet (applet);
+ }
+
+ /* Button clicked */
diff --git a/matchbox-panel-desktop.patch b/matchbox-panel-desktop.patch
deleted file mode 100644
index 57628e3..0000000
--- a/matchbox-panel-desktop.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- matchbox-panel-0.9.3/applets/dotdesktop/mb-applet-battery.desktop.orig 2005-10-03 00:06:57.000000000 +0200
-+++ matchbox-panel-0.9.3/applets/dotdesktop/mb-applet-battery.desktop 2006-12-27 04:06:28.420700478 +0100
-@@ -1,8 +1,12 @@
- [Desktop Entry]
-+Encoding=UTF-8
- Name=Battery Monitor
-+Name[pl]=Monitor baterii
- Comment=Panel based Battery Monitor
-+Comment[pl]=Siedzący w panelu monitor baterii
- Exec=mb-applet-battery
- Type=PanelApp
-+Terminal=false
- Icon=miniapm.png
--Categories=Panel;Utility;MB
--
-+Categories=Applet;Utility;
-+# vi:encoding=utf-8
---- matchbox-panel-0.9.3/applets/dotdesktop/mb-applet-clock.desktop.orig 2005-10-03 00:06:57.000000000 +0200
-+++ matchbox-panel-0.9.3/applets/dotdesktop/mb-applet-clock.desktop 2006-12-27 04:06:01.143146019 +0100
-@@ -1,7 +1,12 @@
- [Desktop Entry]
-+Encoding=UTF-8
- Name=Clock
-+Name[pl]=Zegar
- Comment=Panel based clock
-+Comment[pl]=Zegar siedzący w panelu
- Exec=mb-applet-clock
- Type=PanelApp
-+Terminal=false
- Icon=minitime.png
--Categories=Panel;Utility;MB
-+Categories=Applet;Utility;
-+# vi:encoding=utf-8
---- matchbox-panel-0.9.3/applets/dotdesktop/mb-applet-menu-launcher.desktop.orig 2005-10-03 00:06:57.000000000 +0200
-+++ matchbox-panel-0.9.3/applets/dotdesktop/mb-applet-menu-launcher.desktop 2006-12-27 04:07:02.898665265 +0100
-@@ -1,7 +1,12 @@
- [Desktop Entry]
-+Encoding=UTF-8
- Name=App Launcher
-+Name[pl]=Uruchamianie aplikacji
- Comment=Panel based Application Launcher
-+Comment[pl]=Uruchamianie aplikacji z panelu
- Exec=mb-applet-menu-launcher
- Type=PanelApp
-+Terminal=false
- Icon=mbmenu.png
--Categories=Panel;Utility;MB
-+Categories=Applet;Utility;
-+# vi:encoding=utf-8
---- matchbox-panel-0.9.3/applets/dotdesktop/mb-applet-system-monitor.desktop.orig 2005-10-03 00:06:57.000000000 +0200
-+++ matchbox-panel-0.9.3/applets/dotdesktop/mb-applet-system-monitor.desktop 2006-12-27 04:08:46.596574672 +0100
-@@ -1,7 +1,12 @@
- [Desktop Entry]
-+Encoding=UTF-8
- Name=CPU/Mem Monitor
-+Name[pl]=Monitor CPU/pamięci
- Comment=Panel based CPU/Mem Monitor
-+Comment[pl]=Siedzący w panelu monitor CPU/pamięci
- Exec=mb-applet-system-monitor
- Type=PanelApp
-+Terminal=false
- Icon=minisys.png
--Categories=Panel;Utility;MB
-+Categories=Applet;Utility;
-+# vi:encoding=utf-8
---- matchbox-panel-0.9.3/applets/dotdesktop/mb-applet-wireless.desktop.orig 2005-10-03 00:06:57.000000000 +0200
-+++ matchbox-panel-0.9.3/applets/dotdesktop/mb-applet-wireless.desktop 2006-12-27 04:08:35.499942312 +0100
-@@ -1,7 +1,12 @@
- [Desktop Entry]
-+Encoding=UTF-8
- Name=Wireless Monitor
-+Name[pl]=Monitor sieci bezprzewodowej
- Comment=Panel based wireless monitor
-+Comment[pl]=Siedzący w panelu monitor sieci bezprzewodowej
- Exec=mb-applet-wireless
- Type=PanelApp
-+Terminal=false
- Icon=signal-81-100.png
--Categories=Panel;Utility;MB
-+Categories=Applet;Utility;
-+# vi:encoding=utf-8
---- matchbox-panel-0.9.3/applets/dotdesktop/mb-launcher-term.desktop.orig 2005-10-03 00:06:57.000000000 +0200
-+++ matchbox-panel-0.9.3/applets/dotdesktop/mb-launcher-term.desktop 2006-12-27 04:09:48.380095515 +0100
-@@ -1,8 +1,13 @@
- [Desktop Entry]
-+Encoding=UTF-8
- Name=Term Launcher
-+Name[pl]=Uruchomienie terminala
- Comment=Panel based Terminal launcher
-+Comment[pl]=Uruchamianie terminala z panelu
- # the '-o -1' makes monolaunch dock to the left
- Exec=mb-applet-launcher -o -1 -l mbterm.png mb-applet-xterm-wrapper.sh
- Type=PanelApp
-+Terminal=false
- Icon=mbterm.png
--Categories=Panel;Utility;MB
-+Categories=Applet;Utility;
-+# vi:encoding=utf-8
diff --git a/matchbox-panel-format.patch b/matchbox-panel-format.patch
new file mode 100644
index 0000000..14e2ac4
--- /dev/null
+++ b/matchbox-panel-format.patch
@@ -0,0 +1,11 @@
+--- matchbox-panel-2.0/matchbox-panel/mb-panel-scaling-image.c.orig 2008-02-21 19:02:10.000000000 +0100
++++ matchbox-panel-2.0/matchbox-panel/mb-panel-scaling-image.c 2019-01-27 09:22:19.851853959 +0100
+@@ -289,7 +289,7 @@
+ } else
+ g_object_unref (pixbuf);
+ } else {
+- g_warning (error->message);
++ g_warning ("%s", error->message);
+
+ g_error_free (error);
+ }
diff --git a/matchbox-panel-gcc4.patch b/matchbox-panel-gcc4.patch
deleted file mode 100644
index 88528f3..0000000
--- a/matchbox-panel-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- matchbox-panel-0.9.3/applets/mb-applet-battery.c.orig 2006-02-07 23:27:24.000000000 +0100
-+++ matchbox-panel-0.9.3/applets/mb-applet-battery.c 2006-12-27 04:25:25.289486938 +0100
-@@ -177,7 +177,7 @@
- unsigned long present_rate;
- };
-
-- static int
-+ int
- line_parse(char *line, struct entry *e)
- {
- char *ptr;
diff --git a/matchbox-panel-no-Werror.patch b/matchbox-panel-no-Werror.patch
new file mode 100644
index 0000000..1831ea9
--- /dev/null
+++ b/matchbox-panel-no-Werror.patch
@@ -0,0 +1,62 @@
+--- matchbox-panel-2.0/matchbox-panel/Makefile.am.orig 2008-01-17 22:45:15.000000000 +0100
++++ matchbox-panel-2.0/matchbox-panel/Makefile.am 2019-01-27 09:23:32.448519793 +0100
+@@ -1,8 +1,8 @@
+ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" \
+ -DGETTEXT_PACKAGE=\"matchbox-panel\" \
+ -DDEFAULT_APPLET_PATH=\"$(pkglibdir)\"
+-AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) \
+- -I$(top_srcdir) -I$(top_builddir) -Werror
++AM_CFLAGS = -Wall $(MATCHBOX_PANEL_CFLAGS) \
++ -I$(top_srcdir) -I$(top_builddir)
+
+ matchbox_panelincdir = $(pkgincludedir)
+
+--- matchbox-panel-2.0/applets/brightness/Makefile.am.orig 2008-02-04 11:14:46.000000000 +0100
++++ matchbox-panel-2.0/applets/brightness/Makefile.am 2019-01-27 09:25:10.025185348 +0100
+@@ -3,8 +3,8 @@
+ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" \
+ -DGETTEXT_PACKAGE=\"matchbox-panel\" \
+ -DDATADIR=\"$(pkgdatadir)/brightness/\"
+-AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) \
+- -I$(top_srcdir) -I$(top_builddir) -Werror
++AM_CFLAGS = -Wall $(MATCHBOX_PANEL_CFLAGS) \
++ -I$(top_srcdir) -I$(top_builddir)
+
+ appletdir = $(pkglibdir)
+ applet_LTLIBRARIES = libbrightness.la
+--- matchbox-panel-2.0/applets/notify/Makefile.am.orig 2008-02-02 16:41:44.000000000 +0100
++++ matchbox-panel-2.0/applets/notify/Makefile.am 2019-01-27 09:26:13.408517960 +0100
+@@ -1,6 +1,6 @@
+ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\"
+-AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) $(DBUS_CFLAGS) \
+- -I$(top_srcdir) -I$(top_builddir) -Werror
++AM_CFLAGS = -Wall $(MATCHBOX_PANEL_CFLAGS) $(DBUS_CFLAGS) \
++ -I$(top_srcdir) -I$(top_builddir)
+
+ appletdir = $(pkglibdir)
+ applet_LTLIBRARIES = libnotify.la
+--- matchbox-panel-2.0/applets/startup/Makefile.am.orig 2008-01-17 22:45:16.000000000 +0100
++++ matchbox-panel-2.0/applets/startup/Makefile.am 2019-01-27 10:25:45.228477175 +0100
+@@ -3,8 +3,8 @@
+ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" \
+ -DGETTEXT_PACKAGE=\"matchbox-panel\" \
+ -DDATADIR=\"$(pkgdatadir)/startup/\"
+-AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) \
+- -I$(top_srcdir) -I$(top_builddir) -Werror \
++AM_CFLAGS = -Wall $(MATCHBOX_PANEL_CFLAGS) \
++ -I$(top_srcdir) -I$(top_builddir) \
+ $(SN_CFLAGS)
+
+ appletdir = $(pkglibdir)
+--- matchbox-panel-2.0/applets/startup-notify/Makefile.am.orig 2008-02-18 18:23:30.000000000 +0100
++++ matchbox-panel-2.0/applets/startup-notify/Makefile.am 2019-01-27 10:28:45.728475115 +0100
+@@ -1,7 +1,7 @@
+ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" \
+ -DGETTEXT_PACKAGE=\"matchbox-panel\"
+-AM_CFLAGS = -Wall -g $(MATCHBOX_PANEL_CFLAGS) \
+- -I$(top_srcdir) -I$(top_builddir) -Werror \
++AM_CFLAGS = -Wall $(MATCHBOX_PANEL_CFLAGS) \
++ -I$(top_srcdir) -I$(top_builddir) \
+ $(SN_CFLAGS) $(DBUS_CFLAGS)
+
+ appletdir = $(pkglibdir)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/matchbox-panel.git/commitdiff/3259e2b8f53d1b3c46e2405c0f2e2bf6255efc22
More information about the pld-cvs-commit
mailing list