From f6d18d9ab088406b46d60f0a705e60b32e144458 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 16 Jan 2012 20:19:25 -0500 Subject: [PATCH] gnomeos: Building a lot more up towards gnome-shell --- gnomeos/3.4/iso-codes-autogen.patch | 27 +++++++ gnomeos/3.4/iso-codes-builddir.patch | 81 ++++++++++++++++++++ gnomeos/3.4/iso-codes-no-builddir.patch | 26 +++++++ gnomeos/3.4/libwacom-autogen.patch | 25 +++++++ gnomeos/3.4/libxklavier-no-builddir.patch | 26 +++++++ gnomeos/3.4/manifest.json | 91 ++++++++++++++++++++++- gnomeos/3.4/xkbcomp-autogen.patch | 26 +++++++ 7 files changed, 299 insertions(+), 3 deletions(-) create mode 100644 gnomeos/3.4/iso-codes-autogen.patch create mode 100644 gnomeos/3.4/iso-codes-builddir.patch create mode 100644 gnomeos/3.4/iso-codes-no-builddir.patch create mode 100644 gnomeos/3.4/libwacom-autogen.patch create mode 100644 gnomeos/3.4/libxklavier-no-builddir.patch create mode 100644 gnomeos/3.4/xkbcomp-autogen.patch diff --git a/gnomeos/3.4/iso-codes-autogen.patch b/gnomeos/3.4/iso-codes-autogen.patch new file mode 100644 index 00000000..eeaed1dc --- /dev/null +++ b/gnomeos/3.4/iso-codes-autogen.patch @@ -0,0 +1,27 @@ +From 7f4b51e6900c65771b335ee3d713523dfebb5a6d Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 16 Jan 2012 19:04:39 -0500 +Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1 + +See http://people.gnome.org/~walters/docs/build-api.txt +--- + autogen.sh | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 1733313..ad12d9c 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -8,5 +8,7 @@ cd $srcdir + aclocal + autoconf + automake --add-missing --foreign --copy +-cd $topdir +-$srcdir/configure $@ ++if test -z "$NOCONFIGURE"; then ++ cd $topdir ++ $srcdir/configure "$@" ++fi +-- +1.7.6.4 + diff --git a/gnomeos/3.4/iso-codes-builddir.patch b/gnomeos/3.4/iso-codes-builddir.patch new file mode 100644 index 00000000..f0a5b5c7 --- /dev/null +++ b/gnomeos/3.4/iso-codes-builddir.patch @@ -0,0 +1,81 @@ +From aa3a12c9d88e97f579f749f9f2f941d344399c7f Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 16 Jan 2012 19:08:29 -0500 +Subject: [PATCH] build: Fix srcdir != builddir + +--- + iso_15924/Makefile.am | 2 +- + iso_3166/Makefile.am | 2 +- + iso_3166_2/Makefile.am | 2 +- + iso_4217/Makefile.am | 2 +- + iso_639_3/Makefile.am | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/iso_15924/Makefile.am b/iso_15924/Makefile.am +index ae40422..da56abf 100644 +--- a/iso_15924/Makefile.am ++++ b/iso_15924/Makefile.am +@@ -9,7 +9,7 @@ mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles)) + noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot) + + iso_15924.pot: iso_15924.xml +- ../iso2pot.py --is-version ${VERSION} --comments alpha_4_code \ ++ $(top_srcdir)/iso2pot.py --is-version ${VERSION} --comments alpha_4_code \ + --fields name --outfile $@ $< + + EXTRA_DIST = \ +diff --git a/iso_3166/Makefile.am b/iso_3166/Makefile.am +index 6ffe6cb..a623090 100644 +--- a/iso_3166/Makefile.am ++++ b/iso_3166/Makefile.am +@@ -9,7 +9,7 @@ mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles)) + noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot) + + iso_3166.pot: iso_3166.xml +- ../iso2pot.py --is-version $(VERSION) --comments alpha_3_code \ ++ $(top_srcdir)/iso2pot.py --is-version $(VERSION) --comments alpha_3_code \ + --fields name,names,official_name,common_name --outfile $@ $< + + EXTRA_DIST = \ +diff --git a/iso_3166_2/Makefile.am b/iso_3166_2/Makefile.am +index 42ebb30..ddb01bc 100644 +--- a/iso_3166_2/Makefile.am ++++ b/iso_3166_2/Makefile.am +@@ -9,7 +9,7 @@ mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles)) + noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot) + + iso_3166_2.pot: iso_3166_2.xml +- ../iso2pot.py --is-version ${VERSION} --comment code \ ++ $(top_srcdir)/iso2pot.py --is-version ${VERSION} --comment code \ + --fields name --outfile $@ $< + + EXTRA_DIST = \ +diff --git a/iso_4217/Makefile.am b/iso_4217/Makefile.am +index cf6ac04..1d7c680 100644 +--- a/iso_4217/Makefile.am ++++ b/iso_4217/Makefile.am +@@ -9,7 +9,7 @@ mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles)) + noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot) + + iso_4217.pot: iso_4217.xml +- ../iso2pot.py --is-version ${VERSION} --comments letter_code \ ++ $(top_srcdir)/iso2pot.py --is-version ${VERSION} --comments letter_code \ + --fields currency_name --outfile $@ $< + + EXTRA_DIST = \ +diff --git a/iso_639_3/Makefile.am b/iso_639_3/Makefile.am +index 5dbe2c6..d517ba2 100644 +--- a/iso_639_3/Makefile.am ++++ b/iso_639_3/Makefile.am +@@ -9,7 +9,7 @@ mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles)) + noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot) + + iso_639_3.pot: iso_639_3.xml +- ../iso2pot.py --is-version ${VERSION} --comment id \ ++ $(top_srcdir)/iso2pot.py --is-version ${VERSION} --comment id \ + --fields name --outfile $@ $< + + EXTRA_DIST = \ +-- +1.7.6.4 + diff --git a/gnomeos/3.4/iso-codes-no-builddir.patch b/gnomeos/3.4/iso-codes-no-builddir.patch new file mode 100644 index 00000000..b3458152 --- /dev/null +++ b/gnomeos/3.4/iso-codes-no-builddir.patch @@ -0,0 +1,26 @@ +From 813b8a0e83be08491d2ca6231cfefe976d942107 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 16 Jan 2012 19:13:36 -0500 +Subject: [PATCH] configure: Specify no build directory + +--- + configure.ac | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 05a44a6..75a0c64 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -19,6 +19,9 @@ AC_INIT([iso-codes],[3.26]) + AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip foreign]) + AM_MAINTAINER_MODE + ++dnl http://people.gnome.org/~walters/docs/build-api.txt ++echo \#buildapi-variable-no-builddir >/dev/null ++ + AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"]) + + AC_PROG_INSTALL +-- +1.7.6.4 + diff --git a/gnomeos/3.4/libwacom-autogen.patch b/gnomeos/3.4/libwacom-autogen.patch new file mode 100644 index 00000000..dc0f8e02 --- /dev/null +++ b/gnomeos/3.4/libwacom-autogen.patch @@ -0,0 +1,25 @@ +From 6b92186a171988dd4624b302f22c13a2eb837b16 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 16 Jan 2012 20:02:27 -0500 +Subject: [PATCH] autogen: Honor NOCONFIGURE=1 + +See http://people.gnome.org/~walters/docs/build-api.txt +--- + autogen.sh | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 904cd67..b47abdc 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -9,4 +9,6 @@ cd $srcdir + autoreconf -v --install || exit 1 + cd $ORIGDIR || exit $? + +-$srcdir/configure --enable-maintainer-mode "$@" ++if test -z "$NOCONFIGURE"; then ++ $srcdir/configure --enable-maintainer-mode "$@" ++fi +-- +1.7.6.4 + diff --git a/gnomeos/3.4/libxklavier-no-builddir.patch b/gnomeos/3.4/libxklavier-no-builddir.patch new file mode 100644 index 00000000..c26af39c --- /dev/null +++ b/gnomeos/3.4/libxklavier-no-builddir.patch @@ -0,0 +1,26 @@ +From cba6ce13bead45ab2df5012da584a26b5a58a563 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 16 Jan 2012 19:16:19 -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 4beff28..a903256 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,6 +13,9 @@ AC_CONFIG_AUX_DIR([build-aux]) + AM_INIT_AUTOMAKE([1.10 dist-bzip2 -Wno-portability]) + AM_MAINTAINER_MODE([enable]) + ++dnl http://people.gnome.org/~walters/docs/build-api.txt ++echo \#buildapi-variable-no-builddir >/dev/null ++ + # Support silent build rules, requires at least automake-1.11. Disable + # by either passing --disable-silent-rules to configure or passing V=1 + # to make +-- +1.7.6.4 + diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json index 43350035..efeaba61 100644 --- a/gnomeos/3.4/manifest.json +++ b/gnomeos/3.4/manifest.json @@ -11,7 +11,9 @@ "fd-NM": "git:git://anongit.freedesktop.org/git/NetworkManager/", "fd-mesa": "git:git://anongit.freedesktop.org/git/mesa/", "fd-pulse": "git:git://anongit.freedesktop.org/git/pulseaudio/", + "fd-p11": "git:git://anongit.freedesktop.org/git/p11-glue/", "0pointer": "git:git://git.0pointer.de/", + "linuxwacom": "git:git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/", "fedora": "git:git://git.fedorahosted.org/", "savannah": "git:git://git.savannah.gnu.org/", "debian": "git:git://anonscm.debian.org/", @@ -42,6 +44,8 @@ {"src": "gnome:linux-user-chroot"}, + {"src": "gnome:ostree-init"}, + {"src": "gnome:ostree", "config-opts": ["--disable-documentation"]}, @@ -261,6 +265,9 @@ {"src": "fd:xorg/lib/libXdamage", "patches": ["xorg-autogen.patch"]}, + {"src": "fd:xorg/lib/libXcomposite", + "patches": ["xorg-autogen.patch"]}, + {"src": "fd:xorg/lib/libxkbfile", "patches": ["xorg-autogen.patch"]}, @@ -318,7 +325,8 @@ "--enable-inotify", "--disable-xml-docs", "--disable-doxygen-docs", - "--disable-tests"], + "--disable-tests", + "--with-system-pid-file=/run/dbus.pid"], "patches": ["dbus-xmlto-docs.patch"]}, {"src": "fd:xorg/util/makedepend", @@ -348,6 +356,15 @@ "patches": ["mesa-no-builddir.patch", "mesa-minstall-pwd.patch"]}, + {"src": "fd:xorg/app/xkbcomp", + "patches": ["xkbcomp-autogen.patch"]}, + + {"src": "fd:xorg/app/xrandr", + "patches": ["xkbcomp-autogen.patch"]}, + + {"src": "fd:xkeyboard-config", + "patches": ["xorg-autogen.patch"]}, + {"src": "fd:xorg/xserver", "patches": ["xorg-autogen.patch"]}, @@ -435,7 +452,34 @@ "name": "gtk3", "branch": "3b6665aad2c895fc8bc308fc47628001bbc0b401"}, - {"src": "fd:accountsservice"}, + {"src": "fd-p11:p11-kit"}, + + {"src": "gnome:gcr"}, + + {"src": "gnome:json-glib"}, + + {"src": "gnome:libcroco", + "branch": "0.6.3"}, + + {"src": "gnome:librsvg", + "config-opts": ["--disable-gtk-theme"]}, + + {"src": "gnome:cogl"}, + + {"src": "gnome:clutter"}, + + {"src": "gnome:libnotify"}, + + {"src": "cgwalters:iso-codes", + "rm-configure": true, + "patches": ["iso-codes-autogen.patch", + "iso-codes-no-builddir.patch", + "iso-codes-builddir.patch"]}, + + {"src": "fd:libxklavier", + "config-opts": ["--disable-introspection"]}, + + {"src": "gnome:libgnomekbd"}, {"src": "fd-pulse:pulseaudio", "branch": "v0.9.23", @@ -446,9 +490,50 @@ "patches": ["libcanberra-autogen.patch", "libcanberra-no-lynx.patch"]}, + {"src": "gnome:gsettings-desktop-schemas"}, + + {"src": "gnome:gnome-session"}, + + {"src": "gnome:gnome-desktop", + "config-opts": ["--disable-desktop-docs"]}, + + {"src": "git:git://github.com/mm2/Little-CMS.git", + "branch": "lcms2.3"}, + + {"src": "git:git://gitorious.org/colord/master.git", + "name": "colord"}, + + {"src": "linuxwacom:libwacom", + "patches": ["libwacom-autogen.patch"]}, + + {"src": "gnome:gnome-settings-daemon", + "config-opts": ["--disable-packagekit", + "--disable-cups"]}, + + {"src": "gnome:gnome-themes-standard"}, + + {"src": "gnome:gvfs"}, + + {"src": "gnome:gnome-screensaver"}, + + {"src": "gnome:gnome-menus"}, + + {"src": "git:git://git.webkit.org/WebKit.git"}, + + {"src": "gnome:gnome-online-accounts"}, + + {"src": "gnome:gnome-bluetooth"}, + + {"src": "gnome:mutter"}, + + {"src": "gnome:gjs"}, + + {"src": "gnome:gnome-shell"}, + + {"src": "fd:accountsservice"}, + {"src": "gnome:gdm", "config-opts": ["--disable-documentation"], "patches": ["gdm-disable-documentation.patch"]} - ] } diff --git a/gnomeos/3.4/xkbcomp-autogen.patch b/gnomeos/3.4/xkbcomp-autogen.patch new file mode 100644 index 00000000..a7750c7e --- /dev/null +++ b/gnomeos/3.4/xkbcomp-autogen.patch @@ -0,0 +1,26 @@ +From 8d6be7bc9020efa0e8ed1e0f81d3ab1afb152592 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 16 Jan 2012 10:22:18 -0500 +Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1 + +See http://people.gnome.org/~walters/docs/build-api.txt +--- + autogen.sh | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index e81f989..2641722 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -9,5 +9,7 @@ cd $srcdir + autoreconf -v --install || exit 1 + cd $ORIGDIR || exit $? + +-$srcdir/configure --enable-maintainer-mode "$@" ++if test -z "$NOCONFIGURE"; then ++ $srcdir/configure --enable-maintainer-mode "$@" ++fi + +-- +1.7.6.4 +