Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f4363c633357a052eed214a586f32da8d82e1c9b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f4363c633357a052eed214a586f32da8d82e1c9b)
  • Date: Sat, 6 Aug 2016 13:25:11 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

graphics/nitrogen/0001-explicitly-check-for-x11-lib-in-configure.ac.patch |
20 ++++++++++
graphics/nitrogen/HISTORY |
4 ++
graphics/nitrogen/PRE_BUILD |
5 +-
3 files changed, 26 insertions(+), 3 deletions(-)

New commits:
commit f4363c633357a052eed214a586f32da8d82e1c9b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/nitrogen: fix linker error

diff --git
a/graphics/nitrogen/0001-explicitly-check-for-x11-lib-in-configure.ac.patch
b/graphics/nitrogen/0001-explicitly-check-for-x11-lib-in-configure.ac.patch
new file mode 100644
index 0000000..a4d0523
--- /dev/null
+++
b/graphics/nitrogen/0001-explicitly-check-for-x11-lib-in-configure.ac.patch
@@ -0,0 +1,20 @@
+commit 30b50d1e3d77966cd29e27c12dbe8f12eff2175d
+Author: Dave Foster <daf AT minuslab.net>
+Date: Wed Mar 28 21:28:33 2012 -0400
+
+ Explicitly check for X11 lib in configure.ac, possibly fixes #12
+
+diff --git a/configure.ac b/configure.ac
+index 05fa03b..aa4dc42 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,6 +39,9 @@ PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >=
$GTHREAD2_VERSION])
+ NITROGEN_LIBS="$GLIB2_LIBS $GTK2_LIBS $GTKMM2_LIBS $GTHREAD2_LIBS"
+ NITROGEN_CFLAGS="$GLIB2_CFLAGS $GTK2_CFLAGS $GTKMM2_CFLAGS $GTHREAD2_CFLAGS"
+
++dnl apparantly we have to check for X11 now
++AC_CHECK_LIB(X11, XOpenDisplay, [NITROGEN_LIBS="$NITROGEN_LIBS -lX11"])
++
+ dnl do some autotools picen to get inotify
+ AC_ARG_ENABLE(inotify, [ --disable-inotify disable support for
inotify watching of dirs (default: enabled)],
[enable_inotify=$enableval],[enable_inotify=yes])
+
diff --git a/graphics/nitrogen/HISTORY b/graphics/nitrogen/HISTORY
index 43315fe..9689ac5 100644
--- a/graphics/nitrogen/HISTORY
+++ b/graphics/nitrogen/HISTORY
@@ -1,3 +1,7 @@
+2016-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-explicitly-check-for-x11-lib-in-configure.ac.patch:
+ fix linker error
+
2015-10-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: fix LDFLAGS

diff --git a/graphics/nitrogen/PRE_BUILD b/graphics/nitrogen/PRE_BUILD
index 64cba99..bd39ca4 100755
--- a/graphics/nitrogen/PRE_BUILD
+++ b/graphics/nitrogen/PRE_BUILD
@@ -1,5 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-if [[ $NITROGEN_BRANCH == scm ]]; then
- ./bootstrap
-fi
+patch -p1 <
"$SPELL_DIRECTORY/0001-explicitly-check-for-x11-lib-in-configure.ac.patch" &&
+./bootstrap



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f4363c633357a052eed214a586f32da8d82e1c9b), Florian Franzmann, 08/06/2016

Archive powered by MHonArc 2.6.24.

Top of Page