diff --git a/gnomeos/3.4/ConsoleKit-builddir.patch b/gnomeos/3.4/ConsoleKit-builddir.patch new file mode 100644 index 00000000..19e0a670 --- /dev/null +++ b/gnomeos/3.4/ConsoleKit-builddir.patch @@ -0,0 +1,56 @@ +From ae9072bbd4abfe3c0f7f419a5ab3e087dc4584b4 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Fri, 13 Jan 2012 20:29:37 -0500 +Subject: [PATCH] build-sys: Fix some srcdir != builddir issues + +* Look in the build directory for generated headers. +* Look in source directory for source files +* Also while we have the patient open, make some generation rules + atomic. +--- + src/Makefile.am | 17 +++++++++-------- + 1 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 869decd..322861a 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -9,6 +9,7 @@ SUBDIRS = \ + INCLUDES = \ + -I. \ + -I$(srcdir) \ ++ -I$(builddir) \ + $(CONSOLE_KIT_CFLAGS) \ + $(POLKIT_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) \ +@@ -83,19 +84,19 @@ dbusif_DATA = \ + org.freedesktop.ConsoleKit.Session.xml \ + $(NULL) + +-ck-manager-glue.h: org.freedesktop.ConsoleKit.Manager.xml Makefile.am +- dbus-binding-tool --prefix=ck_manager --mode=glib-server --output=ck-manager-glue.h org.freedesktop.ConsoleKit.Manager.xml +-ck-seat-glue.h: org.freedesktop.ConsoleKit.Seat.xml Makefile.am +- dbus-binding-tool --prefix=ck_seat --mode=glib-server --output=ck-seat-glue.h org.freedesktop.ConsoleKit.Seat.xml +-ck-session-glue.h: org.freedesktop.ConsoleKit.Session.xml Makefile.am +- dbus-binding-tool --prefix=ck_session --mode=glib-server --output=ck-session-glue.h org.freedesktop.ConsoleKit.Session.xml ++ck-manager-glue.h: $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml Makefile.am ++ dbus-binding-tool --prefix=ck_manager --mode=glib-server --output=ck-manager-glue.h $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml ++ck-seat-glue.h: $(srcdir)/org.freedesktop.ConsoleKit.Seat.xml Makefile.am ++ dbus-binding-tool --prefix=ck_seat --mode=glib-server --output=ck-seat-glue.h $(srcdir)/org.freedesktop.ConsoleKit.Seat.xml ++ck-session-glue.h: $(srcdir)/org.freedesktop.ConsoleKit.Session.xml Makefile.am ++ dbus-binding-tool --prefix=ck_session --mode=glib-server --output=ck-session-glue.h $(srcdir)/org.freedesktop.ConsoleKit.Session.xml + + ck-marshal.c: ck-marshal.list + echo "#include \"ck-marshal.h\"" > $@ && \ +- @GLIB_GENMARSHAL@ $< --prefix=ck_marshal --body >> $@ ++ @GLIB_GENMARSHAL@ $< --prefix=ck_marshal --body > $@.tmp && mv $@.tmp $@ + + ck-marshal.h: ck-marshal.list +- @GLIB_GENMARSHAL@ $< --prefix=ck_marshal --header > $@ ++ @GLIB_GENMARSHAL@ $< --prefix=ck_marshal --header > $@.tmp && mv $@.tmp $@ + + console_kit_daemon_SOURCES = \ + main.c \ +-- +1.7.6.4 + diff --git a/gnomeos/3.4/libatasmart-autogen.patch b/gnomeos/3.4/libatasmart-autogen.patch new file mode 100644 index 00000000..df3d1f05 --- /dev/null +++ b/gnomeos/3.4/libatasmart-autogen.patch @@ -0,0 +1,26 @@ +From d3a0d8cbbe8f2375f34ee4c28e4279a8130455e3 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Sat, 14 Jan 2012 15:48:55 -0500 +Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1 environment variable + +See http://people.gnome.org/~walters/docs/build-api.txt +--- + autogen.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index d9bef57..ff38f5c 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -70,7 +70,7 @@ else + run_versioned autoheader "$AC_VERSION" + run_versioned automake "$AM_VERSION" --copy --foreign --add-missing + +- if [ "x$1" != "xac" ]; then ++ if [ "x$1" != "xac" ] && test -z "$NOCONFIGURE"; then + CFLAGS="$CFLAGS -g -O0" ./configure \ + --sysconfdir=/etc \ + --localstatedir=/var \ +-- +1.7.6.4 + diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json index 62d64c87..fbe459d3 100644 --- a/gnomeos/3.4/manifest.json +++ b/gnomeos/3.4/manifest.json @@ -9,6 +9,7 @@ "fd": "git:git://anongit.freedesktop.org/git/", "fd-dbus": "git:git://anongit.freedesktop.org/git/dbus/", "fd-NM": "git:git://anongit.freedesktop.org/git/NetworkManager/", + "fd-mesa": "git:git://anongit.freedesktop.org/git/mesa/", "fedora": "git:git://git.fedorahosted.org/", "savannah": "git:git://git.savannah.gnu.org/", "debian": "git:git://anonscm.debian.org/", @@ -255,6 +256,9 @@ {"src": "fd:xorg/lib/libXxf86vm", "patches": ["xorg-libXxf86vm-autogen.patch"]}, + {"src": "fd:xorg/lib/libXdamage", + "patches": ["xorg-autogen.patch"]}, + {"src": "fd:xorg/lib/libxkbfile", "patches": ["xorg-autogen.patch"]}, @@ -315,6 +319,36 @@ "--disable-tests"], "patches": ["dbus-xmlto-docs.patch"]}, + {"src": "fd:xorg/util/makedepend", + "component": "devel", + "patches": ["xorg-autogen.patch"]}, + + {"src": "fd:xorg/lib/libpciaccess", + "patches": ["xorg-autogen.patch"]}, + + {"src": "fd-mesa:drm", + "config-opts": ["--enable-nouveau-experimental-api"]}, + + {"src": "fd-mesa:mesa", + "config-opts": ["--disable-asm", + "--disable-glw", + "--disable-glut", + "--enable-gl-osmesa", + "--with-driver=dri", + "--with-osmesa-bits=8", + "--with-dri-driverdir=/usr/lib/dri", + "--enable-egl", + "--enable-gles1", + "--enable-gles2", + "--disable-gallium-egl", + "--disable-gallium-llvm", + "--with-gallium-drivers=swrast"], + "patches": ["mesa-no-builddir.patch", + "mesa-minstall-pwd.patch"]}, + + {"src": "fd:xorg/xserver", + "patches": ["xorg-autogen.patch"]}, + {"src": "fd-dbus:dbus-glib", "config-opts": ["--disable-gtk-doc"]}, @@ -345,6 +379,25 @@ "--with-dhclient=yes", "--with-crypto=nss", "--with-docs=no"], - "patches": ["NetworkManager-config.patch"]} + "patches": ["NetworkManager-config.patch"]}, + + {"src": "fd:ConsoleKit", + "patches": ["ConsoleKit-builddir.patch"]}, + + {"src": "fd:PolicyKit", + "config-opts": ["--disable-man-pages"]}, + + {"src": "git:git://git.0pointer.de/libatasmart.git", + "patches": ["libatasmart-autogen.patch"]}, + + {"src": "fd:udisks", + "config-opts": ["--disable-documentation"], + "patches": ["udisks-autogen-no-gtk-doc.patch", + "udisks-no-builddir.patch", + "udisks-build-without-docs.patch"]}, + + {"src": "fd:upower", + "config-opts": ["--disable-man-pages"], + "patches": ["upower-no-builddir.patch"]} ] } diff --git a/gnomeos/3.4/mesa-minstall-pwd.patch b/gnomeos/3.4/mesa-minstall-pwd.patch new file mode 100644 index 00000000..6f8a3ec2 --- /dev/null +++ b/gnomeos/3.4/mesa-minstall-pwd.patch @@ -0,0 +1,49 @@ +From 10f7688eaa7e3380960dcb7d53b28af78dffe96b Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Sat, 14 Jan 2012 13:17:42 -0500 +Subject: [PATCH] build: Don't call pwd in minstall + +This triggers a bug in the eglibc I'm currently using because the +build process is inside a chroot, with a bind mount outside of it. +--- + bin/minstall | 15 +++------------ + 1 files changed, 3 insertions(+), 12 deletions(-) + +diff --git a/bin/minstall b/bin/minstall +index 094ec0c..f69e1ca 100755 +--- a/bin/minstall ++++ b/bin/minstall +@@ -61,27 +61,18 @@ if [ $# -ge 2 ] ; then + ;; + esac + +- PWDSAVE=`pwd` +- + # determine file's type + if [ -h "$FILE" ] ; then + #echo $FILE is a symlink + # Unfortunately, cp -d isn't universal so we have to + # use a work-around. + +- # Use ls -l to find the target that the link points to +- LL=`ls -l "$FILE"` +- for L in $LL ; do +- TARGET=$L +- done ++ TARGET=`readlink "$FILE"` + #echo $FILE is a symlink pointing to $TARGET + +- FILE=`basename "$FILE"` + # Go to $DEST and make the link +- cd "$DEST" # pushd +- $RM "$FILE" +- $SYMLINK "$TARGET" "$FILE" +- cd "$PWDSAVE" # popd ++ $RM $DEST/`basename "$FILE"` ++ $SYMLINK "$TARGET" $DEST/`basename "$FILE"` + + elif [ -f "$FILE" ] ; then + #echo "$FILE" is a regular file +-- +1.7.6.4 + diff --git a/gnomeos/3.4/mesa-no-builddir.patch b/gnomeos/3.4/mesa-no-builddir.patch new file mode 100644 index 00000000..c016c2fe --- /dev/null +++ b/gnomeos/3.4/mesa-no-builddir.patch @@ -0,0 +1,26 @@ +From 2a51740f99f9c0e97abab461154203fc22931b3c Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Sat, 14 Jan 2012 09:16:20 -0500 +Subject: [PATCH] build: Note that we don't support srcdir != builddir + +--- + configure.ac | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7c50e3c..8a47911 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,6 +18,9 @@ AC_CONFIG_AUX_DIR([bin]) + AC_CANONICAL_HOST + AM_INIT_AUTOMAKE([foreign]) + ++dnl http://people.gnome.org/~walters/docs/build-api.txt ++echo \#buildapi-variable-no-builddir >/dev/null ++ + dnl Save user CFLAGS and CXXFLAGS so one can override the default ones + USER_CFLAGS="$CFLAGS" + USER_CXXFLAGS="$CXXFLAGS" +-- +1.7.6.4 + diff --git a/gnomeos/3.4/udisks-autogen-no-gtk-doc.patch b/gnomeos/3.4/udisks-autogen-no-gtk-doc.patch new file mode 100644 index 00000000..f934958d --- /dev/null +++ b/gnomeos/3.4/udisks-autogen-no-gtk-doc.patch @@ -0,0 +1,26 @@ +From 66f7851e8864f12409a1b1c22759c74773dde432 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Sat, 14 Jan 2012 15:25:27 -0500 +Subject: [PATCH] autogen.sh: Don't pass --enable-gtk-doc automatically + +This conflicts with jhbuild where we do want to disable gtk-doc +for speed, and it conflicts with the GNOME Build API because +we want the meta-build configuration to set this, not the autogen.sh +script. +--- + autogen.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 7688f86..7fddf46 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -17,4 +17,4 @@ which gnome-autogen.sh || { + exit 1 + } + +-. gnome-autogen.sh --enable-gtk-doc $* ++. gnome-autogen.sh "$*" +-- +1.7.6.4 + diff --git a/gnomeos/3.4/udisks-build-without-docs.patch b/gnomeos/3.4/udisks-build-without-docs.patch new file mode 100644 index 00000000..9f73ef9d --- /dev/null +++ b/gnomeos/3.4/udisks-build-without-docs.patch @@ -0,0 +1,59 @@ +From da61dedfa523f3e6761ed0da91d8d95c6d4caebd Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Sat, 14 Jan 2012 16:33:56 -0500 +Subject: [PATCH] configure: Support building without documentation + +Docbook is the source of many dependency cycles; allow building +without it for bootstrapping. +--- + configure.ac | 12 +++++++++--- + doc/man/Makefile.am | 6 +++++- + 2 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a794bfc..d906d05 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,9 +24,15 @@ GNOME_DEBUG_CHECK + GNOME_COMPILE_WARNINGS([maximum]) + GNOME_MAINTAINER_MODE_DEFINES + +-AC_PATH_PROG([XSLTPROC], [xsltproc]) +-if test -z "$XSLTPROC"; then +- AC_MSG_ERROR([xsltproc is needed]) ++AC_ARG_ENABLE([documentation], ++ AS_HELP_STRING([--enable-documentation], [enable man pages and HTML]), ++ [], [enable_documentation=yes]) ++AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes) ++if test x$enable_documentation = xyes; then ++ AC_PATH_PROG([XSLTPROC], [xsltproc]) ++ if test -z "$XSLTPROC"; then ++ AC_MSG_ERROR([xsltproc is needed for documentation]) ++ fi + fi + + GTK_DOC_CHECK([1.3]) +diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am +index 5e4946d..a03418f 100644 +--- a/doc/man/Makefile.am ++++ b/doc/man/Makefile.am +@@ -1,11 +1,15 @@ + + NULL = + +-man_MANS = \ ++man_MANS = ++ ++if ENABLE_DOCUMENTATION ++man_MANS += \ + udisksctl.1 \ + udisksd.8 \ + udisks.8 \ + $(NULL) ++endif + + udisksctl.1 : udisksctl.xml + $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +-- +1.7.6.4 + diff --git a/gnomeos/3.4/udisks-no-builddir.patch b/gnomeos/3.4/udisks-no-builddir.patch new file mode 100644 index 00000000..07a415c2 --- /dev/null +++ b/gnomeos/3.4/udisks-no-builddir.patch @@ -0,0 +1,26 @@ +From f3c2cc5eab452e5eb091a6687460cad033b82041 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Sat, 14 Jan 2012 16:14:18 -0500 +Subject: [PATCH] build: Note that we don't support srcdir != builddir + +--- + configure.ac | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1643aec..a794bfc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,6 +4,9 @@ AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) + AC_CONFIG_SRCDIR([src]) + AC_CONFIG_HEADERS([config.h]) + ++# http://people.gnome.org/~walters/docs/build-api.txt ++echo \#buildapi-variable-no-builddir >/dev/null ++ + AM_MAINTAINER_MODE + + AC_PROG_CC +-- +1.7.6.4 + diff --git a/gnomeos/3.4/upower-no-builddir.patch b/gnomeos/3.4/upower-no-builddir.patch new file mode 100644 index 00000000..70cd28cf --- /dev/null +++ b/gnomeos/3.4/upower-no-builddir.patch @@ -0,0 +1,26 @@ +From 9b10d2fc4cc815c1ddfa4547142806203045d089 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Sat, 14 Jan 2012 16:50:00 -0500 +Subject: [PATCH] build: Note that we don't support srcdir != builddir + +--- + configure.ac | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 85ff22e..977ab8e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -21,6 +21,9 @@ AC_CONFIG_AUX_DIR([build-aux]) + AM_INIT_AUTOMAKE([1.11 -Wno-portability no-dist-gzip dist-xz tar-ustar]) + AM_MAINTAINER_MODE([enable]) + ++# http://people.gnome.org/~walters/docs/build-api.txt ++echo \#buildapi-variable-no-builddir >/dev/null ++ + # enable nice build output on automake1.11 + AM_SILENT_RULES([yes]) + +-- +1.7.6.4 +