Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (0bbe772874dac5e1e93890aa50b1599777d4f328)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (0bbe772874dac5e1e93890aa50b1599777d4f328)
  • Date: Mon, 25 Jun 2012 22:44:02 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

graphics-libs/babl/BUILD | 2 +
graphics-libs/babl/DEPENDS | 2 +
graphics-libs/babl/HISTORY | 12 +++++++++
graphics-libs/babl/PRE_BUILD | 8 ++++++
graphics-libs/babl/babl-0.1.10-gir-build-fix.patch | 13 +++++++++
graphics-libs/babl/babl-introspection.patch | 28
+++++++++++++++++++++
6 files changed, 65 insertions(+)

New commits:
commit 0bbe772874dac5e1e93890aa50b1599777d4f328
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

babl: Fix compilation with gobject-introspection
* babl-0.1.10-gir-build-fix.patch: Fix compilation with
gobject-introspection.
See https://bugs.gentoo.org/show_bug.cgi?id=413663
* babl-introspection.patch: Fix .gir and .typelib
See https://bugs.gentoo.org/show_bug.cgi?id=413663#c3
* Broken with vala, disable
See https://bugs.gentoo.org/show_bug.cgi?id=413663#c20

diff --git a/graphics-libs/babl/BUILD b/graphics-libs/babl/BUILD
new file mode 100755
index 0000000..b177ff8
--- /dev/null
+++ b/graphics-libs/babl/BUILD
@@ -0,0 +1,2 @@
+OPTS="--without-vala ${OPTS}" &&
+default_build
diff --git a/graphics-libs/babl/DEPENDS b/graphics-libs/babl/DEPENDS
index 8c8b469..66eea8e 100755
--- a/graphics-libs/babl/DEPENDS
+++ b/graphics-libs/babl/DEPENDS
@@ -1,3 +1,5 @@
+depends autoconf &&
+
optional_depends gobject-introspection \
"--enable-introspection=yes" \
"--enable-introspection=no" \
diff --git a/graphics-libs/babl/HISTORY b/graphics-libs/babl/HISTORY
index ab3425c..1612f7e 100644
--- a/graphics-libs/babl/HISTORY
+++ b/graphics-libs/babl/HISTORY
@@ -1,3 +1,15 @@
+2012-06-14 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on autoconf for `autoreconf`
+ * PRE_BUILD: Apply babl-0.1.10-gir-build-fix.patch and
+ babl-introspection.patch
+ * BUILD: Broken with vala, disable
+ See https://bugs.gentoo.org/show_bug.cgi?id=413663#c20
+ * babl-0.1.10-gir-build-fix.patch: Fix compilation with
+ gobject-introspection.
+ See https://bugs.gentoo.org/show_bug.cgi?id=413663
+ * babl-introspection.patch: Fix .gir and .typelib
+ See https://bugs.gentoo.org/show_bug.cgi?id=413663#c3
+
2012-04-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.1.10

diff --git a/graphics-libs/babl/PRE_BUILD b/graphics-libs/babl/PRE_BUILD
new file mode 100755
index 0000000..d802155
--- /dev/null
+++ b/graphics-libs/babl/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+message "${MESSAGE_COLOR}Apply gobject-introspection
patches...${DEFAULT_COLOR}" &&
+patch "${SOURCE_DIRECTORY}"/babl/Makefile.am \
+ "${SPELL_DIRECTORY}"/babl-introspection.patch &&
+patch "${SOURCE_DIRECTORY}"/babl/Makefile.am \
+ "${SPELL_DIRECTORY}"/babl-0.1.10-gir-build-fix.patch &&
+cd "${SOURCE_DIRECTORY}" &&
+autoreconf
diff --git a/graphics-libs/babl/babl-0.1.10-gir-build-fix.patch
b/graphics-libs/babl/babl-0.1.10-gir-build-fix.patch
new file mode 100644
index 0000000..149b14d
--- /dev/null
+++ b/graphics-libs/babl/babl-0.1.10-gir-build-fix.patch
@@ -0,0 +1,13 @@
+# Modified from https://bugs.gentoo.org/show_bug.cgi?id=413663#c19
+
+diff -Naur babl-0.1.10.orig/babl/Makefile.am babl-0.1.10/babl/Makefile.am
+--- babl-0.1.10.orig/babl/Makefile.am 2012-06-14 12:20:51.181049347 -0700
++++ babl-0.1.10/babl/Makefile.am 2012-06-14 12:21:11.045048179 -0700
+@@ -95,6 +95,7 @@
+ if HAVE_INTROSPECTION
+ Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS)
$(c_sources) $(srcdir)/Makefile.am
+ $(INTROSPECTION_SCANNER) -v --namespace Babl
--nsversion=$(BABL_API_VERSION) \
++ --identifier-prefix= --symbol-prefix=babl \
+ --add-include-path=$(srcdir) --add-include-path=. \
+ --library=babl-$(BABL_API_VERSION) \
+ --libtool="$(LIBTOOL)" \
diff --git a/graphics-libs/babl/babl-introspection.patch
b/graphics-libs/babl/babl-introspection.patch
new file mode 100644
index 0000000..bced992
--- /dev/null
+++ b/graphics-libs/babl/babl-introspection.patch
@@ -0,0 +1,28 @@
+# From
http://git.gnome.org/browse/babl/commit/?id=c024c89f95de4a8fa95ba96790dac61768d11a17
+# as noted in https://bugs.gentoo.org/show_bug.cgi?id=413663#c3
+
+From c024c89f95de4a8fa95ba96790dac61768d11a17 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar AT opensuse.org>
+Date: Tue, 10 Jan 2012 16:32:50 +0000
+Subject: gobject-introspection: fix build of the .gir and .typelib files.
+
+---
+diff --git a/babl/Makefile.am b/babl/Makefile.am
+index cefab57..03115a3 100644
+--- a/babl/Makefile.am
++++ b/babl/Makefile.am
+@@ -93,10 +93,10 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+ if HAVE_INTROSPECTION
+-Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS)
$(c_sources) $(srcdir)/Makefile.am
++Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS)
$(c_sources) $(srcdir)/Makefile.am libbabl-@BABL_API_VERSION@.la
+ $(INTROSPECTION_SCANNER) -v --namespace Babl
--nsversion=$(BABL_API_VERSION) \
+ --add-include-path=$(srcdir) --add-include-path=. \
+- --library=babl-$(BABL_API_VERSION) \
++ --library=$(builddir)/libbabl-$(BABL_API_VERSION).la \
+ --libtool="$(LIBTOOL)" \
+ --output $@ \
+ -DBABL_IS_BEING_COMPILED \
+--
+cgit v0.9.0.2



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (0bbe772874dac5e1e93890aa50b1599777d4f328), Eric Sandall, 06/25/2012

Archive powered by MHonArc 2.6.24.

Top of Page