commit 30b4b9122ead5975db825684b8c0140ebad801c3
Author: Jan Rękorajski <[email protected]>
Date: Sun Jun 10 21:25:53 2018 +0000
- dbus-glib build fix
- rel 4
dbus-glib.patch | 12 ++++++++++++
xfce4-taskbar-plugin.spec | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/xfce4-taskbar-plugin.spec b/xfce4-taskbar-plugin.spec
index ea818bb..7c73b3e 100644
--- a/xfce4-taskbar-plugin.spec
+++ b/xfce4-taskbar-plugin.spec
@@ -2,12 +2,13 @@
Summary: Taskbar plugin which mimicks the Windows 7 taskbar (pinning
applications, etc)
Name: xfce4-taskbar-plugin
Version: 0.%{snap}
-Release: 3
+Release: 4
License: GPL v2
Group: X11/Applications
Source0: %{name}-%{snap}.tar.bz2
# Source0-md5: 259533052a8398e50496052699b75787
Patch0: make.patch
+Patch1: dbus-glib.patch
URL: http://git.xfce.org/panel-plugins/xfce4-taskbar-plugin/
BuildRequires: autoconf
BuildRequires: automake
@@ -26,6 +27,7 @@ Taskbar plugin which mimicks the Windows 7 taskbar
%prep
%setup -q -n %{name}
%patch0 -p1
+%patch1 -p1
%build
%{__make} OPT="%{rpmcflags}"
diff --git a/dbus-glib.patch b/dbus-glib.patch
new file mode 100644
index 0000000..db9c86e
--- /dev/null
+++ b/dbus-glib.patch
@@ -0,0 +1,12 @@
+--- xfce4-taskbar-plugin/Makefile.orig 2018-06-10 21:22:12.000000000 +0000
++++ xfce4-taskbar-plugin/Makefile 2018-06-10 21:24:42.834892502 +0000
+@@ -1,7 +1,7 @@
+ PP=-DPACKAGE_NAME="\"Taskbar\"" -DLC_MESSAGES="\"C\""
-DHELPDIR="\"/usr/share/doc/xfce4-taskbar/\""
+-CFLAGS=-fPIC $(PP) $(OPT) -I. `pkg-config --cflags-only-I gtk+-2.0 exo-1
libwnck-1.0 libxfce4panel-1.0 libxfce4ui-1 libxfconf-0 gtkhotkey-1.0`
++CFLAGS=-fPIC $(PP) $(OPT) -I. `pkg-config --cflags-only-I dbus-glib-1
gtk+-2.0 exo-1 libwnck-1.0 libxfce4panel-1.0 libxfce4ui-1 libxfconf-0
gtkhotkey-1.0`
+ #CFLAGS=-fPIC $(PP) -O3 -I. `pkg-config --cflags-only-I gtk+-2.0 exo-1
libwnck-1.0 libxfce4panel-1.0 libxfce4ui-1 libxfconf-0 gtkhotkey-1.0`
+-LINKFLAGS=`pkg-config --libs gtk+-2.0 exo-1 libwnck-1.0 libxfce4panel-1.0
libxfce4ui-1 libxfconf-0 gobject-2.0 gtk+-x11-2.0 glib-2.0 gtkhotkey-1.0`
++LINKFLAGS=`pkg-config --libs dbus-glib-1 gtk+-2.0 exo-1 libwnck-1.0
libxfce4panel-1.0 libxfce4ui-1 libxfconf-0 gobject-2.0 gtk+-x11-2.0 glib-2.0
gtkhotkey-1.0`
+
+ OBJ=taskbar.o taskbar-widget.o hotkeys.o panel-debug.o panel-utils.o
panel-xfconf.o
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xfce4-taskbar-plugin.git/commitdiff/30b4b9122ead5975db825684b8c0140ebad801c3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
