diff options
| author | Aaron Bockover <aaron@abock.org> | 2011-02-26 00:59:32 +0300 |
|---|---|---|
| committer | Aaron Bockover <aaron@abock.org> | 2011-02-26 00:59:32 +0300 |
| commit | 3732d11790ae1be055ce579c58d9c1b37146841a (patch) | |
| tree | 127a51d70ab2d10d057e0c0f81cc0cba2ca7d9ff /packages | |
| parent | f532e52aac943021cee521a044ae7afd90d9e9af (diff) | |
Fix libmurrine build against linking to pixman
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/murrine.py | 15 | ||||
| -rw-r--r-- | packages/patches/murrine-link-pixman.patch | 48 |
2 files changed, 57 insertions, 6 deletions
diff --git a/packages/murrine.py b/packages/murrine.py index 18cc357..1f391e5 100644 --- a/packages/murrine.py +++ b/packages/murrine.py @@ -5,11 +5,14 @@ class MurrinePackage (GnomePackage): version_major = '0.98', version_minor = '1') -# FIXME: this may need porting -# self.sources.append ('patches/murrine-osx.patch') -# -# def prep (self): -# Package.prep (self) -# self.sh ('patch -p1 < "%{sources[1]}"') + self.configure = 'autoreconf -fi && ./configure --prefix="%{prefix}"' + + self.sources.append ('patches/murrine-link-pixman.patch') + # FIXME: this may need porting + # self.sources.append ('patches/murrine-osx.patch') + + def prep (self): + Package.prep (self) + self.sh ('patch -p1 < "%{sources[1]}"') MurrinePackage () diff --git a/packages/patches/murrine-link-pixman.patch b/packages/patches/murrine-link-pixman.patch new file mode 100644 index 0000000..f661a9e --- /dev/null +++ b/packages/patches/murrine-link-pixman.patch @@ -0,0 +1,48 @@ +From 45b5375e5579a189daca64489edab35c7a60066f Mon Sep 17 00:00:00 2001 +From: Aaron Bockover <aaron@abock.org> +Date: Fri, 25 Feb 2011 13:32:26 -0500 +Subject: [PATCH] Fix linking issues with latest pixman + +--- + Makefile.am | 4 ++-- + configure.ac | 4 +++- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index cd7162d..1546cc3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-INCLUDES = $(GTK_CFLAGS) ++INCLUDES = $(GTK_CFLAGS) $(PIXMAN_CFLAGS) + + SUBDIRS = schema + DIST_SUBDIRS = $(SUBDIRS) po +@@ -35,5 +35,5 @@ libmurrine_la_SOURCES = \ + ./src/stack-blur.h + + libmurrine_la_LDFLAGS = -module -avoid-version -no-undefined +-libmurrine_la_LIBADD = $(GTK_LIBS) ++libmurrine_la_LIBADD = $(GTK_LIBS) $(PIXMAN_LIBS) + +diff --git a/configure.ac b/configure.ac +index 175d394..b3e5f9e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,10 +42,12 @@ AC_ARG_ENABLE(rgba, + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18.0,, + AC_MSG_ERROR([GTK+-2.18 is required to compile murrine])) + +-PKG_CHECK_MODULES(pixman,[pixman-1],,AC_MSG_ERROR([Pixman is required to compile murrine])) ++PKG_CHECK_MODULES(PIXMAN,[pixman-1],,AC_MSG_ERROR([Pixman is required to compile murrine])) + + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) ++AC_SUBST(PIXMAN_CFLAGS) ++AC_SUBST(PIXMAN_LIBS) + + GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` + AC_SUBST(GTK_VERSION) +-- +1.7.4 + |