GNOME.org
 

[jhbuild/wip/conditions] 3.12: add some patches for upstream-fixed issues

commit 169eb8eb060119a7c2c116a75a7d1944d1552ae4
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Mar 5 22:42:18 2014 -0500

    3.12: add some patches for upstream-fixed issues
    
    farstream and libpwquality each have FreeBSD build issues fixed upstream
    but no signs of a tarball any time soon.  Take those patches locally
    until the next releases.

 modulesets/gnome-suites-core-deps-3.12.modules |  344 +++++++++++++++++++++++-
 patches/farstream.netinet-in.patch             |   42 +++
 patches/libpwquality.libintl-link.patch        |   37 +++
 3 files changed, 421 insertions(+), 2 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index 99be5f5..d819330 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -502,7 +502,345 @@
     <branch repo="freedesktop.org"
             module="farstream/releases/farstream/farstream-${version}.tar.gz"
             version="0.2.2"
-            hash="sha256:ffd3c536372781713956eeb28644a6e9ee6e3bab034bee65af6bbb61213cb080"/>
+            hash="sha256:ffd3c536372781713956eeb28644a6e9ee6e3bab034bee65af6bbb61213cb080">
+      <patch file="farstream.netinet-in.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="libnice"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="telepathy-farstream" autogenargs="--disable-python --disable-Werror">
+    <branch repo="telepathy.freedesktop.org"/>
+    <dependencies>
+      <dep package="telepathy-glib"/>
+      <dep package="farstream"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="exempi" autogenargs="--enable-unittest=no">
+    <pkg-config>exempi-2.0.pc</pkg-config>
+    <branch repo="libopenraw.freedesktop.org"
+            module="exempi-${version}.tar.bz2"
+            version="2.2.0"
+            hash="sha256:8ac374cca17df023ae978bb5f7a9d5d116da89141192f8de8c8060de0722b00f"/>
+  </autotools>
+
+  <autotools id="folks" autogenargs="--enable-eds-backend --disable-libsocialweb-backend 
--disable-fatal-warnings">
+    <branch/>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="libgee"/>
+      <dep package="vala"/>
+      <dep package="gobject-introspection"/>
+      <dep package="telepathy-glib"/>
+      <dep package="evolution-data-server"/>
+      <dep package="zeitgeist"/>
+      <dep package="shared-mime-info"/>
+    </dependencies>
+    <suggests>
+      <dep package="telepathy-logger"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gnome-js-common">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+    </dependencies>
+    <suggests>
+      <dep package="seed"/>
+      <dep package="gjs"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="grilo">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+    <suggests>
+      <dep package="gtk+"/>
+      <dep package="vala"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="totem-pl-parser"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="grilo-plugins">
+    <branch/>
+    <dependencies>
+      <dep package="grilo"/>
+      <dep package="libxml2"/>
+      <dep package="totem-pl-parser"/>
+    </dependencies>
+    <suggests>
+      <dep package="libgdata"/>
+      <dep package="gmime"/>
+      <dep package="gupnp"/>
+      <dep package="gupnp-av"/>
+      <dep package="sqlite3"/>
+      <dep package="libgcrypt"/>
+      <dep package="tracker"/>
+      <dep package="libmediaart"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gtksourceview" autogenargs="--enable-compile-warnings=maximum">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="libxml2"/>
+      <dep package="shared-mime-info"/>
+      <dep package="gtk+"/>
+    </dependencies>
+    <suggests>
+      <dep package="glade"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="harfbuzz" autogenargs="">
+    <branch repo="git.freedesktop.org"
+      module="harfbuzz" checkoutdir="harfbuzz"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="ragel"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="librest">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libsecret">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+    <suggests>
+      <dep package="libgcrypt"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gobject-introspection">
+    <branch/>
+    <dependencies>
+      <dep package="bison"/>
+      <dep package="flex"/>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="python2-devel"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gjs" autogenargs="--enable-installed-tests --enable-coverage">
+    <branch/>
+    <dependencies>
+      <dep package="dbus-glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="js24"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="seed" autogenargs="--with-webkit=3.0">
+    <branch/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="WebKit"/>
+      <dep package="gnome-js-common"/>
+      <dep package="mpfr"/>
+      <dep package="readline"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gstreamer"
+             autogenargs="--disable-tests --disable-fatal-warnings"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gstreamer"
+            checkoutdir="gstreamer"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libxml2"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-base"
+             autogenargs="--disable-fatal-warnings"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-plugins-base"
+            checkoutdir="gst-plugins-base"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gtk+"/>
+      <dep package="iso-codes"/>
+    </dependencies>
+    <suggests>
+      <dep package="gudev"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gst-plugins-good"
+             autogenargs="--disable-fatal-warnings"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-plugins-good"
+            checkoutdir="gst-plugins-good"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="flac"/>
+      <dep package="libv4l"/>
+      <dep package="libvpx"/>
+      <dep package="taglib"/>
+      <dep package="wavpack"/>
+    </dependencies>
+    <suggests>
+      <dep package="pulseaudio"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gudev"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gst-plugins-bad"
+             autogenargs="--disable-fatal-warnings"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            checkoutdir="gst-plugins-bad"
+            module="gst-plugins-bad"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="mm-common">
+    <branch/>
+  </autotools>
+
+  <autotools id="libsigc++2">
+    <branch/>
+    <dependencies>
+      <dep package="mm-common"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="glibmm">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsigc++2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pangomm">
+    <branch/>
+    <dependencies>
+      <dep package="glibmm"/>
+      <dep package="cairomm"/>
+      <dep package="pango"/>
+      <dep package="atk"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="atkmm">
+    <branch/>
+    <dependencies>
+      <dep package="glibmm"/>
+      <dep package="atk"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtkmm">
+    <branch/>
+    <dependencies>
+      <dep package="pangomm"/>
+      <dep package="atkmm"/>
+      <dep package="gtk+"/>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gssdp" makeargs="CFLAGS=-Wno-error">
+    <branch />
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+    </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gupnp"
+             autogenargs="--with-context-manager=network-manager">
+    <branch />
+    <dependencies>
+      <dep package="gssdp"/>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="shared-mime-info"/>
+    </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+      <dep package="NetworkManager"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gupnp-igd"
+             autogenargs="--disable-python">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gupnp"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="itstool">
+    <branch repo="itstool.org"
+            module="itstool-2.0.2.tar.bz2"
+            version="2.0.2"
+            hash="sha256:bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a"
+            size="96748"/>
+  </autotools>
+
+  <autotools id="java-gnome" autogen-sh="configure" skip-autogen="never">
+    <branch repo="research.operationaldynamics.com"
+            module="bzr/java-gnome/mainline"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="pango"/>
+      <dep package="atk"/>
+      <dep package="gtk+"/>
+      <dep package="gtksourceview"/>
+      <dep package="librsvg"/>
+      <dep package="enchant"/>
+      <dep package="libnotify"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="js17" check-target="false"
+      autogenargs="--enable-threadsafe --with-system-nspr --enable-debug --disable-optimize">
+    <pkg-config>mozjs-17.0.pc</pkg-config>
+    <branch repo="ftp.mozilla.org"
+            module="pub/mozilla.org/js/mozjs17.0.0.tar.gz"
+            version="17.0.0"
+            hash="sha256:321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba"
+            checkoutdir="js17-17.0.0">
+      <patch
+    </branch>
     <dependencies>
       <dep package="libnice"/>
     </dependencies>
@@ -1382,7 +1720,9 @@
     <branch repo="libpwquality"
             module="https://fedorahosted.org/releases/l/i/libpwquality/libpwquality-1.2.2.tar.bz2"; 
version="1.2.2"
             hash="sha256:9689627283b43d20ca74ca822404ee486242e3e528fa95bf7016d37ff46e0696"
-            size="362081"/>
+            size="362081">
+      <patch file="libpwquality.libintl-link.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="cracklib"/>
     </dependencies>
diff --git a/patches/farstream.netinet-in.patch b/patches/farstream.netinet-in.patch
new file mode 100644
index 0000000..304e747
--- /dev/null
+++ b/patches/farstream.netinet-in.patch
@@ -0,0 +1,42 @@
+From 8b99315a911e82aaaac31566c33d0a2d7f3483b1 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt desrt ca>
+Date: Thu, 13 Feb 2014 22:03:09 -0500
+Subject: [PATCH] transmitters: include <netinet/in.h> for IPPROTO_*
+
+POSIX says that we need <netinet/in.h> for IPPROTO_* to be defined, so
+make sure we include it.
+
+It also ensures that we get a definition of 'struct sockaddr' which
+appears in the rawudp header as an argument type.
+---
+ transmitters/multicast/fs-multicast-transmitter.c | 1 +
+ transmitters/rawudp/fs-rawudp-transmitter.h       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/transmitters/multicast/fs-multicast-transmitter.c 
b/transmitters/multicast/fs-multicast-transmitter.c
+index 24eeb78..61a4a75 100644
+--- a/transmitters/multicast/fs-multicast-transmitter.c
++++ b/transmitters/multicast/fs-multicast-transmitter.c
+@@ -54,6 +54,7 @@
+ # define close closesocket
+ #else /*G_OS_WIN32*/
+ # include <sys/socket.h>
++# include <netinet/in.h>
+ # include <arpa/inet.h>
+ #endif /*G_OS_WIN32*/
+ 
+diff --git a/transmitters/rawudp/fs-rawudp-transmitter.h b/transmitters/rawudp/fs-rawudp-transmitter.h
+index 23ec312..6fd8302 100644
+--- a/transmitters/rawudp/fs-rawudp-transmitter.h
++++ b/transmitters/rawudp/fs-rawudp-transmitter.h
+@@ -34,6 +34,7 @@
+ # include <ws2tcpip.h>
+ #else /*G_OS_WIN32*/
+ # include <arpa/inet.h>
++# include <netinet/in.h>
+ #endif /*G_OS_WIN32*/
+ 
+ G_BEGIN_DECLS
+-- 
+1.8.5.3
+
diff --git a/patches/libpwquality.libintl-link.patch b/patches/libpwquality.libintl-link.patch
new file mode 100644
index 0000000..db0ccf3
--- /dev/null
+++ b/patches/libpwquality.libintl-link.patch
@@ -0,0 +1,37 @@
+diff -r -u libpwquality-1.2.2/src/Makefile.am libpwquality-1.2.2+/src/Makefile.am
+--- libpwquality-1.2.2/src/Makefile.am 2014-03-05 22:36:14.323988295 -0500
++++ libpwquality-1.2.2+/src/Makefile.am        2014-03-05 22:37:26.324056066 -0500
+@@ -25,13 +25,13 @@
+ libpwquality_la_LDFLAGS = -no-undefined $(libpwquality_version_script) \
+       -version-info @PWQUALITY_LT_CURRENT@:@PWQUALITY_LT_REVISION@:@PWQUALITY_LT_AGE@
+ 
+-libpwquality_la_LIBADD = @LIBCRACK@
++libpwquality_la_LIBADD = @LIBCRACK@ $(LIBINTL)
+ 
+ libpwquality_la_SOURCES = generate.c check.c settings.c error.c
+ 
+ if HAVE_PAM
+   pam_pwquality_la_LDFLAGS = -no-undefined -avoid-version -module
+-  pam_pwquality_la_LIBADD = libpwquality.la @PAM_LIBS@
++  pam_pwquality_la_LIBADD = libpwquality.la @PAM_LIBS@ $(LIBINTL)
+   pam_pwquality_la_SOURCES = pam_pwquality.c
+ else
+   pam_pwquality_la_LDFLAGS =
+diff -r -u libpwquality-1.2.2/src/Makefile.in libpwquality-1.2.2+/src/Makefile.in
+--- libpwquality-1.2.2/src/Makefile.in 2013-06-19 11:41:37.000000000 -0400
++++ libpwquality-1.2.2+/src/Makefile.in        2014-03-05 22:38:01.938157558 -0500
+@@ -308,12 +308,12 @@
+ libpwquality_la_LDFLAGS = -no-undefined $(libpwquality_version_script) \
+       -version-info @PWQUALITY_LT_CURRENT@:@PWQUALITY_LT_REVISION@:@PWQUALITY_LT_AGE@
+ 
+-libpwquality_la_LIBADD = @LIBCRACK@
++libpwquality_la_LIBADD = @LIBCRACK@ $(LIBINTL)
+ libpwquality_la_SOURCES = generate.c check.c settings.c error.c
+ @HAVE_PAM_FALSE pam_pwquality_la_LDFLAGS = 
+ @HAVE_PAM_TRUE pam_pwquality_la_LDFLAGS = -no-undefined -avoid-version -module
+ @HAVE_PAM_FALSE pam_pwquality_la_LIBADD = 
+- HAVE_PAM_TRUE@pam_pwquality_la_LIBADD = libpwquality.la @PAM_LIBS@
++ HAVE_PAM_TRUE@pam_pwquality_la_LIBADD = libpwquality.la @PAM_LIBS@ $(LIBINTL)
+ @HAVE_PAM_FALSE pam_pwquality_la_SOURCES = 
+ @HAVE_PAM_TRUE pam_pwquality_la_SOURCES = pam_pwquality.c
+ pwscore_SOURCES = pwscore.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]