[xfce4-smartbookmark-plugin] Add patch to link against libxfcegui4
Kevin Fenzi
kevin at fedoraproject.org
Fri Jan 14 00:32:44 UTC 2011
commit eb92ad23ea5e2ab1eefaf3a5625e0ff44c7c3f19
Author: Kevin Fenzi <kevin at tummy.com>
Date: Thu Jan 13 17:32:31 2011 -0700
Add patch to link against libxfcegui4
xfce4-smartbookmark-plugin-fix-linking.patch | 36 ++++++++++++++++++++++++++
xfce4-smartbookmark-plugin.spec | 10 ++++++-
2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/xfce4-smartbookmark-plugin-fix-linking.patch b/xfce4-smartbookmark-plugin-fix-linking.patch
new file mode 100644
index 0000000..d93fbf6
--- /dev/null
+++ b/xfce4-smartbookmark-plugin-fix-linking.patch
@@ -0,0 +1,36 @@
+Description: port to 4.7 panel by linking explicitely to libxfcegui4
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6939
+Author: Yves-Alexis Perez <corsac at debian.org>
+diff --git a/configure.ac b/configure.ac
+index 1ba88d4..cb344f5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,7 +25,7 @@ XDT_I18N([ca cs en_GB eu fr hu it pl pt_PT sq zh_TW])
+ dnl Check for required packages
+ XDT_CHECK_LIBX11_REQUIRE()
+ XDT_CHECK_PACKAGE([GDK], [gdk-2.0], [2.0])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfce4panel-1.0], [4.2])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
+
+ XDT_FEATURE_DEBUG()
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 30c058c..91d97d5 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,11 +6,13 @@ plugin_LTLIBRARIES = \
+ libsmartbookmark_la_LDFLAGS = \
+ -O0 \
+ -avoid-version \
+- -module \
++ -module
++
++libsmartbookmark_la_LIBADD = \
+ @LIBXFCE4PANEL_LIBS@ \
+ @LIBXFCEGUI4_LIBS@ \
+ @GDK_LIBS@ \
+- @LIBX11_LDFLAGS@
++ @LIBX11_LIBS@
+
+ libsmartbookmark_la_SOURCES = \
+ smartbookmark.c
diff --git a/xfce4-smartbookmark-plugin.spec b/xfce4-smartbookmark-plugin.spec
index e0b8b45..e77f7b2 100644
--- a/xfce4-smartbookmark-plugin.spec
+++ b/xfce4-smartbookmark-plugin.spec
@@ -1,6 +1,6 @@
Name: xfce4-smartbookmark-plugin
Version: 0.4.2
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Smart bookmarks for the Xfce panel
Group: User Interface/Desktops
@@ -13,6 +13,8 @@ Patch0: %{name}-0.4.2-multilib.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=509294
# not yet in Xfce bugzilla, because the smartbookmark component is missing
Patch1: %{name}-0.4.2-desktop-file.patch
+#
+Patch2: xfce4-smartbookmark-plugin-fix-linking.patch
# vendor specific patches
Patch10: %{name}-redhat.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,6 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.90.2
BuildRequires: libxml2-devel, gettext, perl(XML::Parser)
BuildRequires: libXt-devel
+BuildRequires: autoconf
Requires: xfce4-panel >= 4.4.0, webclient
%description
@@ -31,9 +34,11 @@ browser and perform custom searches.
%setup -q
%patch0 -b .multilib
%patch1 -b .path
+%patch2 -p1 -b .linking
%patch10 -b .redhat
%build
+autoconf
%configure --disable-static
make %{?_smp_mflags}
@@ -53,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xfce4/panel-plugins/*.desktop
%changelog
+* Thu Jan 13 2011 Kevin Fenzi <kevin at tummy.com> - 0.4.2-11
+- Add patch to link against libxfcegui4
+
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list