Date: Sun, 26 Jun 2011 07:34:33 -0700 (PDT) From: Raphael Kubo da Costa <kubito@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/158315: [MAINTAINER] x11-themes/gtk-oxygen-engine: Fix build on < 8.1, depend on dbus-glib Message-ID: <4e074379.2499ec0a.3089.ffffbeea@mx.google.com> Resent-Message-ID: <201106261440.p5QEe0Il012515@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158315
>Category: ports
>Synopsis: [MAINTAINER] x11-themes/gtk-oxygen-engine: Fix build on < 8.1, depend on dbus-glib
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 26 14:40:00 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Raphael Kubo da Costa
>Release: FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD gibbon 8.2-STABLE FreeBSD 8.2-STABLE #31: Sat Jun 18 13:48:12 BRT 2011
>Description:
This patch makes the dependency on dbus-glib explicit, otherwise packages will be built without dbus supprort.
Furthermore, it fixes the build on FreeBSD 8.1, which have a different signature for dlerror(3).
Added file(s):
- files/extra-patch-demo-oxygengtkdeco_main.cpp
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- gtk-oxygen-engine-1.1.0_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-themes/gtk-oxygen-engine/Makefile /usr/home/rakuco/dev/ports/gtk-oxygen-engine/x11-themes/gtk-oxygen-engine/Makefile
--- /usr/ports/x11-themes/gtk-oxygen-engine/Makefile 2011-06-19 15:08:44.000000000 -0300
+++ /usr/home/rakuco/dev/ports/gtk-oxygen-engine/x11-themes/gtk-oxygen-engine/Makefile 2011-06-26 11:32:15.000000000 -0300
@@ -7,6 +7,7 @@
PORTNAME= oxygen
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}-gtk/${PORTVERSION}/src/
@@ -17,11 +18,20 @@
MAINTAINER= kubito@gmail.com
COMMENT= Oxygen-Gtk engine and theme
-LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
USE_BZIP2= yes
USE_GNOME= gtk20 pkgconfig
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+# FreeBSD SVN r205606 was only MFC'ed to 8.1+, so we need to match
+# the old function signature on previous versions.
+.if ${OSVERSION} < 801000
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-demo-oxygengtkdeco_main.cpp
+.endif
+
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/x11-themes/gtk-oxygen-engine/files/extra-patch-demo-oxygengtkdeco_main.cpp /usr/home/rakuco/dev/ports/gtk-oxygen-engine/x11-themes/gtk-oxygen-engine/files/extra-patch-demo-oxygengtkdeco_main.cpp
--- /usr/ports/x11-themes/gtk-oxygen-engine/files/extra-patch-demo-oxygengtkdeco_main.cpp 1969-12-31 21:00:00.000000000 -0300
+++ /usr/home/rakuco/dev/ports/gtk-oxygen-engine/x11-themes/gtk-oxygen-engine/files/extra-patch-demo-oxygengtkdeco_main.cpp 2011-06-26 11:16:35.000000000 -0300
@@ -0,0 +1,11 @@
+--- demo/oxygengtkdeco_main.cpp~ 2011-06-26 11:15:05.000000000 -0300
++++ demo/oxygengtkdeco_main.cpp 2011-06-26 11:16:02.000000000 -0300
+@@ -118,7 +118,7 @@ int dh=0;
+ gboolean initLib()
+ {
+ void* library;
+- char* error=0;
++ const char* error=0;
+ char* moduleDir=gtk_rc_get_module_dir();
+ if(moduleDir)
+ {
--- gtk-oxygen-engine-1.1.0_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4e074379.2499ec0a.3089.ffffbeea>