packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move gnomeos/ to "gnome-ostree" module 

Now that we're hopefully going to be changing the format less.  The
layering here is now more clear, rather than having things entangled.
This commit is contained in:
Colin Walters 2012-05-09 08:45:56 -04:00
parent cefbe90281
commit d2da92be07
102 changed files with 0 additions and 36994 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnomeos/.gitignore vendored
View File

@ -1 +0,0 @@
ostree_switch_root

56
gnomeos/3.4/ConsoleKit-builddir.patch
View File

@ -1,56 +0,0 @@
From ae9072bbd4abfe3c0f7f419a5ab3e087dc4584b4 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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

367
gnomeos/3.4/NetworkManager-builddir.patch
View File

@ -1,367 +0,0 @@
From 3b12f65e888a69f74dee291344eb636997111222 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 22 Feb 2012 16:37:38 -0500
Subject: [PATCH] build: Fix srcdir != builddir for new generated headers
---
callouts/Makefile.am | 2 ++
callouts/tests/Makefile.am | 1 +
cli/src/Makefile.am | 1 +
examples/C/glib/Makefile.am | 1 +
libnm-glib/Makefile.am | 1 +
libnm-glib/tests/Makefile.am | 1 +
libnm-util/tests/Makefile.am | 3 ++-
src/Makefile.am | 2 ++
src/bluez-manager/Makefile.am | 2 ++
src/dhcp-manager/Makefile.am | 2 ++
src/dhcp-manager/tests/Makefile.am | 1 +
src/dns-manager/Makefile.am | 1 +
src/generated/Makefile.am | 1 +
src/ip6-manager/Makefile.am | 2 ++
src/modem-manager/Makefile.am | 4 +++-
src/ppp-manager/Makefile.am | 2 ++
src/settings/Makefile.am | 2 ++
src/settings/plugins/keyfile/Makefile.am | 3 ++-
src/settings/plugins/keyfile/tests/Makefile.am | 1 +
src/supplicant-manager/Makefile.am | 4 +++-
src/supplicant-manager/tests/Makefile.am | 1 +
src/tests/Makefile.am | 1 +
src/vpn-manager/Makefile.am | 2 ++
test/Makefile.am | 1 +
24 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/callouts/Makefile.am b/callouts/Makefile.am
index a3a2d26..6162785 100644
--- a/callouts/Makefile.am
+++ b/callouts/Makefile.am
@@ -60,6 +60,7 @@ nm_dispatcher_action_CPPFLAGS = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DG_DISABLE_DEPRECATED \
@@ -86,6 +87,7 @@ libtest_dispatcher_envp_la_CPPFLAGS = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am
index 7121b92..93d3fae 100644
--- a/callouts/tests/Makefile.am
+++ b/callouts/tests/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I${top_builddir}/include \
-I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/callouts
noinst_PROGRAMS = \
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
index 742bf0f..ec62bfe 100644
--- a/cli/src/Makefile.am
+++ b/cli/src/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-glib
nmcli_SOURCES = \
diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am
index a8821a9..428f6ad 100644
--- a/examples/C/glib/Makefile.am
+++ b/examples/C/glib/Makefile.am
@@ -1,4 +1,5 @@
INCLUDES = -I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-glib \
-I${top_srcdir}/include \
-I${top_builddir}/include
diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index 0e9c0bd..5abd01a 100644
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
-I$(top_builddir)/marshallers
BUILT_SOURCES = \
diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
index 1564c59..0dba079 100644
--- a/libnm-glib/tests/Makefile.am
+++ b/libnm-glib/tests/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib
noinst_PROGRAMS = test-remote-settings-client
diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am
index a3e12c3..46a4d14 100644
--- a/libnm-util/tests/Makefile.am
+++ b/libnm-util/tests/Makefile.am
@@ -3,7 +3,8 @@ SUBDIRS=certs
INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
- -I$(top_srcdir)/libnm-util
+ -I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util
noinst_PROGRAMS = \
test-settings-defaults \
diff --git a/src/Makefile.am b/src/Makefile.am
index 4112c73..c814e0a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,7 @@ INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/dns-manager \
-I${top_srcdir}/src/vpn-manager \
@@ -36,6 +37,7 @@ INCLUDES = -I${top_srcdir} \
-I$(top_srcdir)/src/firewall-manager \
-I$(top_srcdir)/src/settings \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/callouts
###########################################
diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am
index 7bf00bd..10b32d2 100644
--- a/src/bluez-manager/Makefile.am
+++ b/src/bluez-manager/Makefile.am
@@ -3,8 +3,10 @@ INCLUDES = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging
noinst_LTLIBRARIES = libbluez-manager.la
diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index fcea82e..ce34c41 100644
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -5,8 +5,10 @@ INCLUDES = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src
noinst_LTLIBRARIES = libdhcp-manager.la libdhcp-dhclient.la
diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am
index d1b3c84..1feade8 100644
--- a/src/dhcp-manager/tests/Makefile.am
+++ b/src/dhcp-manager/tests/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I$(top_srcdir)/src/dhcp-manager
noinst_PROGRAMS = test-dhcp-dhclient
diff --git a/src/dns-manager/Makefile.am b/src/dns-manager/Makefile.am
index def8fe6..331f85c 100644
--- a/src/dns-manager/Makefile.am
+++ b/src/dns-manager/Makefile.am
@@ -1,6 +1,7 @@
INCLUDES = \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src \
-I${top_srcdir}/include \
-I${top_builddir}/include
diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am
index 29e1525..83c867a 100644
--- a/src/generated/Makefile.am
+++ b/src/generated/Makefile.am
@@ -41,6 +41,7 @@ nm_marshal_sources = $(nm_daemon_sources)
INCLUDES = \
-I${top_srcdir}/include \
+ -I${top_builddir}/include \
-I${top_srcdir}/src \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/dns-manager \
diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am
index fd3e929..016fc25 100644
--- a/src/ip6-manager/Makefile.am
+++ b/src/ip6-manager/Makefile.am
@@ -3,7 +3,9 @@ INCLUDES = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src
diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am
index ad83e03..a5c6a66 100644
--- a/src/modem-manager/Makefile.am
+++ b/src/modem-manager/Makefile.am
@@ -3,10 +3,12 @@ include $(GLIB_MAKEFILE)
INCLUDES = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/include \
-I${top_builddir}/include \
- -I${top_srcdir}/libnm-util
+ -I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util
noinst_LTLIBRARIES = libmodem-manager.la
diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index 6eb77ef..8df2f58 100644
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -3,8 +3,10 @@ INCLUDES = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging
noinst_LTLIBRARIES = libppp-manager.la
diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am
index 8094ac1..8024d54 100644
--- a/src/settings/Makefile.am
+++ b/src/settings/Makefile.am
@@ -4,7 +4,9 @@ INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src
diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
index e074873..e6af222 100644
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -4,7 +4,8 @@ INCLUDES = \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
- -I$(top_srcdir)/libnm-util
+ -I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util
noinst_LTLIBRARIES = \
libkeyfile-io.la \
diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
index 90bc233..2adbf87 100644
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -4,6 +4,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-I$(srcdir)/../
diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am
index 1c887b1..e8a2ce7 100644
--- a/src/supplicant-manager/Makefile.am
+++ b/src/supplicant-manager/Makefile.am
@@ -3,10 +3,12 @@ SUBDIRS=. tests
INCLUDES = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/include \
-I${top_builddir}/include \
- -I${top_srcdir}/libnm-util
+ -I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util
noinst_LTLIBRARIES = libsupplicant-manager.la
diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am
index b236025..47ae66c 100644
--- a/src/supplicant-manager/tests/Makefile.am
+++ b/src/supplicant-manager/tests/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/supplicant-manager
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 38a8d22..9048704 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/src/dhcp-manager \
-I$(top_builddir)/marshallers \
-I$(top_srcdir)/src \
diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am
index fdc4c89..c3c5b52 100644
--- a/src/vpn-manager/Makefile.am
+++ b/src/vpn-manager/Makefile.am
@@ -3,7 +3,9 @@ INCLUDES = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/src/generated \
+ -I${top_builddir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src \
-I${top_srcdir}/src/dns-manager \
diff --git a/test/Makefile.am b/test/Makefile.am
index 952f8e7..b628536 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,6 @@
INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-glib \
-I${top_srcdir}/include \
-I${top_builddir}/include
--
1.7.6.5

45
gnomeos/3.4/NetworkManager-config.patch
View File

@ -1,45 +0,0 @@
From 7a8b9a75a0bd75d7548b428ee46ee16f296e45f7 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 12 Jan 2012 09:50:57 -0500
Subject: [PATCH] keyfile: Install default config file if we're TARGET_GENERIC
NetworkManager just segfaults on startup if there's no
/etc/NetworkManager/NetworkManager.conf, if we're TARGET_GENERIC, then
we are only using keyfiles, so install a basic config file.
---
src/settings/plugins/keyfile/Makefile.am | 10 +++++++++-
.../plugins/keyfile/NetworkManager-keyfile.conf | 2 ++
2 files changed, 11 insertions(+), 1 deletions(-)
create mode 100644 src/settings/plugins/keyfile/NetworkManager-keyfile.conf
diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
index e941e9b..e074873 100644
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -57,6 +57,14 @@ libnm_settings_plugin_keyfile_la_LDFLAGS = -rdynamic
keyfiledir=$(sysconfdir)/NetworkManager/system-connections
+if TARGET_GENERIC
+install_keyfile_conf=true
+else
+install_keyfile_conf=false
+endif
+
install-data-hook:
$(mkinstalldirs) -m 0755 $(DESTDIR)$(keyfiledir)
-
+ if $(install_keyfile_conf); then \
+ install -m 0644 $(srcdir)/NetworkManager-keyfile.conf $(DESTDIR)/$(sysconfdir)/NetworkManager/NetworkManager.conf; \
+ fi
diff --git a/src/settings/plugins/keyfile/NetworkManager-keyfile.conf b/src/settings/plugins/keyfile/NetworkManager-keyfile.conf
new file mode 100644
index 0000000..c37b596
--- /dev/null
+++ b/src/settings/plugins/keyfile/NetworkManager-keyfile.conf
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile
--
1.7.6.4

26
gnomeos/3.4/NetworkManager-distro.patch
View File

@ -1,26 +0,0 @@
From 0da5b6f2404f8abeb542207aeea23820687e60e4 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 8 Jan 2012 14:13:23 -0500
Subject: [PATCH] configure: Add --with-distro=generic
For now we'll just get a basic NM setup for GNOME.
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7cb5dc0..955e2e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,7 +132,7 @@ if test "z$with_distro" = "z"; then
exit 1
else
case $with_distro in
- redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo) ;;
+ redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|generic) ;;
*)
echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)"
exit 1
--
1.7.6.4

39
gnomeos/3.4/NetworkManager-werror.patch
View File

@ -1,39 +0,0 @@
From 96c2bf715e2bc0912433c4ddbe65f76a0a1dba6f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 29 Jan 2012 16:01:56 -0500
Subject: [PATCH] build: Allow --set-more-warnings=no|yes|error
For the GNOME autobuilders, we want compiler warnings, but don't want
-Werror. For developer compatibility, the default value is "error".
---
m4/compiler_warnings.m4 | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4
index 575ea9a..eeacfae 100644
--- a/m4/compiler_warnings.m4
+++ b/m4/compiler_warnings.m4
@@ -1,7 +1,7 @@
AC_DEFUN([NM_COMPILER_WARNINGS],
[AC_ARG_ENABLE(more-warnings,
- AS_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]),
- set_more_warnings="$enableval",set_more_warnings=yes)
+ AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]),
+ set_more_warnings="$enableval",set_more_warnings=error)
AC_MSG_CHECKING(for more warnings)
if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
AC_MSG_RESULT(yes)
@@ -26,7 +26,9 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
unset SAVE_CFLAGS
done
unset option
- CFLAGS="$CFLAGS -Werror"
+ if test "x$set_more_warnings" = xerror; then
+ CFLAGS="$CFLAGS -Werror"
+ fi
else
AC_MSG_RESULT(no)
fi
--
1.7.6.5

27
gnomeos/3.4/PolicyKit-libtool.patch
View File

@ -1,27 +0,0 @@
From 984263b474387ca4c688f2c830fb3dea16da3ff3 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 29 Jan 2012 16:22:51 -0500
Subject: [PATCH] autogen.sh: Fix check for libtool (we only need libtoolize)
A pre-built libtool copy may not be installed on all systems; all
we need is libtoolize.
---
autogen.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 426e875..d08b00a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -26,7 +26,7 @@ touch ChangeLog
}
(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
- (libtool --version) < /dev/null > /dev/null 2>&1 || {
+ (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have libtool installed."
echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
--
1.7.6.5

25
gnomeos/3.4/WebKit-autogen.patch
View File

@ -1,25 +0,0 @@
From 6dae71d03594b8bcd95195c6c167b4b3ff6780fa Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 18 Jan 2012 16:32:48 -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 bb7779d..029d737 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,4 +20,6 @@ autoreconf --verbose --install -I Source/autotools $ACLOCAL_FLAGS|| exit $?
cd $ORIGDIR || exit 1
-$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
+if test -z "$NOCONFIGURE"; then
+ exec $srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@"
+fi
--
1.7.6.5

34
gnomeos/3.4/accountsservice-builddir.patch
View File

@ -1,34 +0,0 @@
From e866eaadcfe11f36265de4f9088a6958b9d64753 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 22 Feb 2012 22:50:51 -0500
Subject: [PATCH] libaccountsservice: Fix srcdir != builddir for generated
files
---
src/libaccountsservice/Makefile.am | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libaccountsservice/Makefile.am b/src/libaccountsservice/Makefile.am
index 922464a..0bce6a4 100644
--- a/src/libaccountsservice/Makefile.am
+++ b/src/libaccountsservice/Makefile.am
@@ -42,13 +42,13 @@ accounts-user-generated.c accounts-user-generated.h: $(top_srcdir)/data/org.free
gdbus-codegen --generate-c-code accounts-user-generated --c-namespace Accounts --interface-prefix=org.freedesktop.Accounts. $(top_srcdir)/data/org.freedesktop.Accounts.User.xml
ck-manager-generated.c ck-manager-generated.h: org.freedesktop.ConsoleKit.Manager.xml Makefile
- gdbus-codegen --generate-c-code ck-manager-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit org.freedesktop.ConsoleKit.Manager.xml
+ gdbus-codegen --generate-c-code ck-manager-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml
ck-seat-generated.c ck-seat-generated.h: org.freedesktop.ConsoleKit.Seat.xml Makefile
- gdbus-codegen --generate-c-code ck-seat-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit org.freedesktop.ConsoleKit.Seat.xml
+ gdbus-codegen --generate-c-code ck-seat-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit $(srcdir)/org.freedesktop.ConsoleKit.Seat.xml
ck-session-generated.c ck-session-generated.h: org.freedesktop.ConsoleKit.Session.xml Makefile
- gdbus-codegen --generate-c-code ck-session-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit org.freedesktop.ConsoleKit.Session.xml
+ gdbus-codegen --generate-c-code ck-session-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit $(srcdir)/org.freedesktop.ConsoleKit.Session.xml
BUILT_SOURCES += \
accounts-generated.c \
--
1.7.6.5

54
gnomeos/3.4/acl-2.2.39-build.patch
View File

@ -1,54 +0,0 @@
From b525b062317d3174c8fa802302a498beb7d8d111 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@fedoraproject.org>
Date: Fri, 13 Jan 2012 15:49:46 -0500
Subject: [PATCH] build: Support makeinstall DESTDIR=
Signed-off-by: Colin Walters <walters@verbum.org>
---
include/builddefs.in | 16 ++++++++--------
include/buildmacros | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/builddefs.in b/include/builddefs.in
index d054a56..10b0cd4 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -28,14 +28,14 @@ PKG_RELEASE = @pkg_release@
PKG_VERSION = @pkg_version@
PKG_PLATFORM = @pkg_platform@
PKG_DISTRIBUTION= @pkg_distribution@
-PKG_BIN_DIR = @bindir@
-PKG_SBIN_DIR = @sbindir@
-PKG_LIB_DIR = @libdir@@libdirsuffix@
-PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@
-PKG_INC_DIR = @includedir@
-PKG_MAN_DIR = @mandir@
-PKG_DOC_DIR = @datadir@/doc/@pkg_name@
-PKG_LOCALE_DIR = @datadir@/locale
+PKG_BIN_DIR = $(DESTDIR)@bindir@
+PKG_SBIN_DIR = $(DESTDIR)@sbindir@
+PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@
+PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@
+PKG_INC_DIR = $(DESTDIR)@includedir@
+PKG_MAN_DIR = $(DESTDIR)@mandir@
+PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@
+PKG_LOCALE_DIR = $(DESTDIR)@datadir@/locale
CC = @cc@
AWK = @awk@
diff --git a/include/buildmacros b/include/buildmacros
index ab89182..9c4fd50 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
$(LFILES:.l=.o) \
$(YFILES:%.y=%.tab.o)
-INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+INSTALL = $(TOPDIR)/include/install-sh
SHELL = /bin/sh
IMAGES_DIR = $(TOPDIR)/all-images
--
1.7.6.4

55
gnomeos/3.4/acl-add-autogen.patch
View File

@ -1,55 +0,0 @@
From 41c1c78f462aa8bd254c28de0d6dd0b68c6f6571 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 13 Jan 2012 15:16:08 -0500
Subject: [PATCH] autogen.sh: Add developer bootstrap script
This gives us a standard way to build from git. Move the relevant
code out of the Makefile.
See http://people.gnome.org/~walters/docs/build-api.txt
---
Makefile | 10 +---------
autogen.sh | 9 +++++++++
2 files changed, 10 insertions(+), 9 deletions(-)
create mode 100755 autogen.sh
diff --git a/Makefile b/Makefile
index 6969443..26fdbc8 100644
--- a/Makefile
+++ b/Makefile
@@ -57,16 +57,8 @@ else
clean: # if configure hasn't run, nothing to clean
endif
-# Recent versions of libtool require the -i option for copying auxiliary
-# files (config.sub, config.guess, install-sh, ltmain.sh), while older
-# versions will copy those files anyway, and don't understand -i.
-LIBTOOLIZE_INSTALL = `libtoolize -n -i >/dev/null 2>/dev/null && echo -i`
-
configure include/builddefs:
- libtoolize -c $(LIBTOOLIZE_INSTALL) -f
- cp include/install-sh .
- aclocal -I m4
- autoconf
+ ./autogen.sh
./configure \
--prefix=/ \
--exec-prefix=/ \
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..58fa0d6
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Recent versions of libtool require the -i option for copying auxiliary
+# files (config.sub, config.guess, install-sh, ltmain.sh), while older
+# versions will copy those files anyway, and don't understand -i.
+libtoolize_install=`libtoolize -n -i >/dev/null 2>/dev/null && echo -i`
+libtoolize -c ${libtoolize_install}
+cp include/install-sh .
+aclocal -I m4
+autoconf
--
1.7.6.4

28
gnomeos/3.4/acl-makeinstall.patch
View File

@ -1,28 +0,0 @@
From a29218ba1ee9664ce250b7b1b749cb9dc8cc4811 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 13 Jan 2012 15:39:24 -0500
Subject: [PATCH] build: make install install everything
The make install-dev target is nice, but it'd be better eventually to
convert this to Automake after we land patches to do
buildapi-install-devel.
---
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 26fdbc8..1c9f0d6 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ include/config.h: include/builddefs
$(MAKE) $(AM_MAKEFLAGS) include/builddefs; \
fi
-install: default $(addsuffix -install,$(SUBDIRS))
+install: default install-dev install-lib $(addsuffix -install,$(SUBDIRS))
$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
$(INSTALL) -m 644 README $(PKG_DOC_DIR)
--
1.7.6.4

26
gnomeos/3.4/acl-no-builddir.patch
View File

@ -1,26 +0,0 @@
From 384d1ed0af7922804d3f6b83d94490b4d69dc963 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 13 Jan 2012 15:45:43 -0500
Subject: [PATCH] build: Note that we don't support srcdir != builddir
---
configure.in | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/configure.in b/configure.in
index 7af2e8d..75853e3 100644
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,9 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER(include/config.h)
AC_PREFIX_DEFAULT(/usr)
+dnl http://people.gnome.org/~walters/docs/build-api.txt
++echo \#buildapi-variable-no-builddir >/dev/null
+
AC_PROG_LIBTOOL
AC_ARG_ENABLE(shared,
--
1.7.6.4

56
gnomeos/3.4/attr-2.4.32-build.patch
View File

@ -1,56 +0,0 @@
From 8bb41c30cddb806a944fd3811d9c3e5ab9062d9c Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@fedoraproject.org>
Date: Fri, 13 Jan 2012 15:12:33 -0500
Subject: [PATCH] build: Honor DESTDIR
Patch imported from Fedora.
Signed-off-by: Colin Walters <walters@verbum.org>
---
include/builddefs.in | 16 ++++++++--------
include/buildmacros | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/builddefs.in b/include/builddefs.in
index 6df0f5a..575a6df 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -40,14 +40,14 @@ PKG_RELEASE = @pkg_release@
PKG_VERSION = @pkg_version@
PKG_PLATFORM = @pkg_platform@
PKG_DISTRIBUTION= @pkg_distribution@
-PKG_BIN_DIR = @bindir@
-PKG_SBIN_DIR = @sbindir@
-PKG_LIB_DIR = @libdir@@libdirsuffix@
-PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@
-PKG_INC_DIR = @includedir@/attr
-PKG_MAN_DIR = @mandir@
-PKG_DOC_DIR = @datadir@/doc/@pkg_name@
-PKG_LOCALE_DIR = @datadir@/locale
+PKG_BIN_DIR = $(DESTDIR)@bindir@
+PKG_SBIN_DIR = $(DESTDIR)@sbindir@
+PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@
+PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@
+PKG_INC_DIR = $(DESTDIR)@includedir@/attr
+PKG_MAN_DIR = $(DESTDIR)@mandir@
+PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@
+PKG_LOCALE_DIR = $(DESTDIR)@datadir@/locale
CC = @cc@
AWK = @awk@
diff --git a/include/buildmacros b/include/buildmacros
index ab89182..9c4fd50 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
$(LFILES:.l=.o) \
$(YFILES:%.y=%.tab.o)
-INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+INSTALL = $(TOPDIR)/include/install-sh
SHELL = /bin/sh
IMAGES_DIR = $(TOPDIR)/all-images
--
1.7.6.4

55
gnomeos/3.4/attr-add-autogen.patch
View File

@ -1,55 +0,0 @@
From 8ef45b305b45ed22d7508046344bce53a84323ea Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 13 Jan 2012 11:04:34 -0500
Subject: [PATCH] autogen.sh: Add developer bootstrap script
This gives us a standard way to build from git. Move the relevant
code out of the Makefile.
See http://people.gnome.org/~walters/docs/build-api.txt
---
Makefile | 10 +---------
autogen.sh | 9 +++++++++
2 files changed, 10 insertions(+), 9 deletions(-)
create mode 100755 autogen.sh
diff --git a/Makefile b/Makefile
index 080daba..8a9e777 100644
--- a/Makefile
+++ b/Makefile
@@ -58,16 +58,8 @@ else
clean: # if configure hasn't run, nothing to clean
endif
-# Recent versions of libtool require the -i option for copying auxiliary
-# files (config.sub, config.guess, install-sh, ltmain.sh), while older
-# versions will copy those files anyway, and don't understand -i.
-LIBTOOLIZE_INSTALL = `libtoolize -n -i >/dev/null 2>/dev/null && echo -i`
-
configure include/builddefs:
- libtoolize -c $(LIBTOOLIZE_INSTALL) -f
- cp include/install-sh .
- aclocal -I m4
- autoconf
+ ./autogen.sh
./configure \
--prefix=/ \
--exec-prefix=/ \
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..58fa0d6
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Recent versions of libtool require the -i option for copying auxiliary
+# files (config.sub, config.guess, install-sh, ltmain.sh), while older
+# versions will copy those files anyway, and don't understand -i.
+libtoolize_install=`libtoolize -n -i >/dev/null 2>/dev/null && echo -i`
+libtoolize -c ${libtoolize_install}
+cp include/install-sh .
+aclocal -I m4
+autoconf
--
1.7.6.4

28
gnomeos/3.4/attr-makeinstall.patch
View File

@ -1,28 +0,0 @@
From eaea8d256aecd395a46594b291dbfc2172e0ac45 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 13 Jan 2012 15:35:00 -0500
Subject: [PATCH] build: make install install everything
The make install-dev target is nice, but it'd be better eventually to
convert this to Automake after we land patches to do
buildapi-install-devel.
---
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 8a9e777..6bf2365 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ include/config.h: include/builddefs
$(MAKE) $(AM_MAKEFLAGS) include/builddefs; \
fi
-install: default $(addsuffix -install,$(SUBDIRS))
+install: default install-dev install-lib $(addsuffix -install,$(SUBDIRS))
$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
$(INSTALL) -m 644 README $(PKG_DOC_DIR)
--
1.7.6.4

26
gnomeos/3.4/attr-no-builddir.patch
View File

@ -1,26 +0,0 @@
From 9bd0610a1deb725e80270e050ab14c600d484bfa Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 13 Jan 2012 14:23:28 -0500
Subject: [PATCH] build: Note that we don't support srcdir != builddir
---
configure.in | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/configure.in b/configure.in
index b966d0e..b539275 100644
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,9 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER(include/config.h)
AC_PREFIX_DEFAULT(/usr)
+dnl http://people.gnome.org/~walters/docs/build-api.txt
++echo \#buildapi-variable-no-builddir >/dev/null
+
AC_PROG_LIBTOOL
AC_ARG_ENABLE(shared,
--
1.7.6.4

207
gnomeos/3.4/ca-certs-build.patch
View File

@ -1,207 +0,0 @@
From 5171353bc89bab1f4717c11cacd1ab2463b58a99 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 17 Jan 2012 14:56:56 -0500
Subject: [PATCH] Implement GNOME build API
See http://people.gnome.org/~walters/docs/build-api.txt
---
Makefile | 22 ++++++++++++++++++
certdata2pem.py | 12 ++++++---
configure | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++
make-ca-bundle.sh | 45 +++++++++++++++++++++++++++++++++++++
4 files changed, 138 insertions(+), 4 deletions(-)
create mode 100644 Makefile
create mode 100755 configure
create mode 100755 make-ca-bundle.sh
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..422c8c2
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,22 @@
+include Makefile.inc
+
+pkidir=$(sysconfdir)/pki
+
+stamp-certs-created:
+ mkdir -p ca-certificates/certs
+ python $(srcdir)/certdata2pem.py $(srcdir)/certdata.txt $(srcdir)/blacklist.txt ca-certificates/certs
+ $(srcdir)/make-ca-bundle.sh $(srcdir)/certdata.txt ca-certificates
+ touch stamp-certs-created
+
+install: stamp-certs-created
+ mkdir -p $(DESTDIR)$(sysconfdir)/pki/tls/certs
+ install -p -m 644 ca-certificates/ca-bundle.crt $(DESTDIR)$(pkidir)/tls/certs/ca-bundle.crt
+ install -p -m 644 ca-certificates/ca-bundle.trust.crt $(DESTDIR)$(pkidir)/tls/certs/ca-bundle.trust.crt
+ rm -f $(DESTDIR)$(pkidir)/tls/cert.pem
+ ln -s certs/ca-bundle.crt $(DESTDIR)$(pkidir)/tls/cert.pem
+ touch -r $(srcdir)/certdata.txt $(DESTDIR)$(pkidir)/tls/certs/ca-bundle.crt
+ touch -r $(srcdir)/certdata.txt $(DESTDIR)$(pkidir)/tls/certs/ca-bundle.trust.crt
+
+ mkdir -p -m 755 $(DESTDIR)$(sysconfdir)/ssl
+ rm -f $(DESTDIR)$(sysconfdir)/ssl/certs
+ ln -s ../pki/tls/certs $(DESTDIR)$(sysconfdir)/ssl/certs
diff --git a/certdata2pem.py b/certdata2pem.py
index c22946d..b0d6259 100644
--- a/certdata2pem.py
+++ b/certdata2pem.py
@@ -28,10 +28,14 @@ import textwrap
objects = []
+certdata_path = sys.argv[1]
+blacklist_path = sys.argv[2]
+outdir=sys.argv[3]
+
# Dirty file parser.
in_data, in_multiline, in_obj = False, False, False
field, type, value, obj = None, None, None, dict()
-for line in open('certdata.txt', 'r'):
+for line in open(certdata_path, 'r'):
# Ignore the file header.
if not in_data:
if line.startswith('BEGINDATA'):
@@ -81,8 +85,8 @@ if len(obj.items()) > 0:
# Read blacklist.
blacklist = []
-if os.path.exists('blacklist.txt'):
- for line in open('blacklist.txt', 'r'):
+if os.path.exists(blacklist_path):
+ for line in open(blacklist_path, 'r'):
line = line.strip()
if line.startswith('#') or len(line) == 0:
continue
@@ -161,7 +165,7 @@ for obj in objects:
print " -> untrusted, ignoring"
continue
fname = obj_to_filename(obj)
- f = open(fname, 'w')
+ f = open(os.path.join(outdir, fname), 'w')
trustbits = []
openssl_trustflags = []
tobj = trustmap[obj['CKA_LABEL']]
diff --git a/configure b/configure
new file mode 100755
index 0000000..88752a9
--- /dev/null
+++ b/configure
@@ -0,0 +1,63 @@
+#!/bin/bash
+# -*- mode: sh -*-
+# Minimal configure script which writes out a Makefile.inc
+# Copyright 2010, 2011 Colin Walters <walters@verbum.org>
+# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
+
+prefix=/usr
+
+# Little helper function for reading args from the commandline.
+# it automatically handles -a b and -a=b variants, and returns 1 if
+# we need to shift $3.
+read_arg() {
+ # $1 = arg name
+ # $2 = arg value
+ # $3 = arg parameter
+ local rematch='^[^=]*=(.*)$'
+ if [[ $2 =~ $rematch ]]; then
+ read "$1" <<< "${BASH_REMATCH[1]}"
+ else
+ read "$1" <<< "$3"
+ # There is no way to shift our callers args, so
+ # return 1 to indicate they should do it instead.
+ return 1
+ fi
+}
+
+while (($# > 0)); do
+ case "${1%%=*}" in
+ --prefix) read_arg prefix "$@" || shift;;
+ --bindir) read_arg bindir "$@" || shift;;
+ --sbindir) read_arg sbindir "$@" || shift;;
+ --libexecdir) read_arg libexecdir "$@" || shift;;
+ --datarootdir) read_arg datarootdir "$@" || shift;;
+ --datadir) read_arg datadir "$@" || shift;;
+ --sysconfdir) read_arg sysconfdir "$@" || shift;;
+ --libdir) read_arg libdir "$@" || shift;;
+ --mandir) read_arg mandir "$@" || shift;;
+ *) echo "Ignoring unknown option '$1'";;
+ esac
+ shift
+done
+
+# Handle srcdir != builddir
+srcdir=$(dirname $0)
+if ! test -f Makefile; then
+ ln -s ${srcdir}/Makefile Makefile
+fi
+
+cat > Makefile.inc.tmp <<EOF
+srcdir = ${srcdir}
+top_srcdir = ${srcdir}
+
+prefix ?= ${prefix}
+bindir ?= ${bindir:-${prefix}/bin}
+sbindir ?= ${sbindir:-${prefix}/sbin}
+libexecdir ?= ${libexecdir:-${prefix}/libexec}
+datarootdir ?= ${datarootdir:-${prefix}/share}
+datadir ?= ${datadir:-${prefix}/share}
+sysconfdir ?= ${sysconfdir:-${prefix}/etc}
+libdir ?= ${libdir:-${prefix}/lib}
+mandir ?= ${mandir:-${prefix}/share/man}
+EOF
+mv Makefile.inc.tmp Makefile.inc
diff --git a/make-ca-bundle.sh b/make-ca-bundle.sh
new file mode 100755
index 0000000..9c57bef
--- /dev/null
+++ b/make-ca-bundle.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+src=$1
+out=$2
+
+(cat <<EOF
+# This is a bundle of X.509 certificates of public Certificate
+# Authorities. It was generated from the Mozilla root CA list.
+#
+# Source: mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+#
+# Generated from:
+EOF
+ ident -q "$src" | sed '1d;s/^/#/';
+ echo '#';
+) > $out/ca-bundle.crt
+
+(
+ cat <<EOF
+# This is a bundle of X.509 certificates of public Certificate
+# Authorities. It was generated from the Mozilla root CA list.
+# These certificates are in the OpenSSL "TRUSTED CERTIFICATE"
+# format and have trust bits set accordingly.
+#
+# Source: mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+#
+# Generated from:
+EOF
+ ident -q "$1" | sed '1d;s/^/#/';
+ echo '#';
+) > $out/ca-bundle.trust.crt
+for f in $out/certs/*.crt; do
+ tbits=`sed -n '/^# openssl-trust/{s/^.*=//;p;}' $f`
+ case $tbits in
+ *serverAuth*) openssl x509 -text -in "$f" >> $out/ca-bundle.crt ;;
+ esac
+ if [ -n "$tbits" ]; then
+ targs=""
+ for t in $tbits; do
+ targs="${targs} -addtrust $t"
+ done
+ openssl x509 -text -in "$f" -trustout $targs >> $out/ca-bundle.trust.crt
+ fi
+done
+
--
1.7.6.5

39
gnomeos/3.4/dbus-xmlto-docs.patch
View File

@ -1,39 +0,0 @@
From 6bf8258df72c3ebbc6d574dfd5c44561f5a4724b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 8 Jan 2012 12:11:11 -0500
Subject: [PATCH] build: Make --disable-xml-docs build work again
We can't build the .html files without xmlto, so don't add them
to a dist_ variable.
---
doc/Makefile.am | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3fdb780..db2537e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -59,9 +59,6 @@ STATIC_HTML = \
dist_html_DATA += $(STATIC_HTML)
-# we distribute these in the tarball so users don't necessarily need xmlto
-dist_html_DATA += $(XMLTO_OUTPUT)
-
XMLTO_OUTPUT= \
dbus-faq.html \
dbus-specification.html \
@@ -69,6 +66,10 @@ XMLTO_OUTPUT= \
dbus-tutorial.html
if DBUS_XML_DOCS_ENABLED
+
+# we distribute these in the tarball so users don't necessarily need xmlto
+dist_html_DATA += $(XMLTO_OUTPUT)
+
dbus-specification.html: dbus-specification.xml
$(XMLTO) html-nochunks $<
--
1.7.6.4

25
gnomeos/3.4/dconf-builddir.patch
View File

@ -1,25 +0,0 @@
From 79f8f5db8b484b51ee8e18ad464fb789dd4cd3e5 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 20 Jan 2012 17:08:52 -0500
Subject: [PATCH] build: Note we don't support srcdir != builddir
---
configure.ac | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8dcd441..3105995 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,8 @@ AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.11 -Wno-portability no-dist-gzip dist-xz])
AM_SILENT_RULES([yes])
+echo \#buildapi-variable-no-builddir >/dev/null
+
# Check for programs
AC_PROG_CC
AM_PROG_VALAC([0.11.7])
--
1.7.6.5

26
gnomeos/3.4/default-icon-theme-autogen.patch
View File

@ -1,26 +0,0 @@
From 1a872427e5063dbc09014c09ab13a11e1694343f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 23 Jan 2012 19:20:16 -0500
Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1
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 c4d7701..6d07bb7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -50,7 +50,7 @@ for arg in $*; do
esac
done
-if $run_configure; then
+if test -z "$NOCONFIGURE" && $run_configure; then
$srcdir/configure --enable-maintainer-mode --config-cache "$@"
echo
echo "Now type 'make' to compile $PROJECT."
--
1.7.6.5

24
gnomeos/3.4/default-icon-theme-no-builddir.patch
View File

@ -1,24 +0,0 @@
From 59698f4729f384486779efbc8ec7e8c2ecaf548c Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 23 Jan 2012 21:51:57 -0500
Subject: [PATCH] build: Note we don't support srcdir != builddir
---
configure.ac | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index aa5891b..b1a3a8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,7 @@
AC_INIT([hicolor-icon-theme], [0.12])
+echo \#buildapi-variable-no-builddir >/dev/null
+
AC_PROG_INSTALL
AC_CONFIG_FILES([Makefile])
--
1.7.6.5

26
gnomeos/3.4/e-d-s-builddir.patch
View File

@ -1,26 +0,0 @@
From f4c1cff02469a4b3c84aa96d0cd47ba56eee8a76 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 19 Jan 2012 15:33:01 -0500
Subject: [PATCH] build: Note 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 d0b4e00..0a1aa3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,9 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(README)
AC_CONFIG_HEADERS(config.h)
+dnl http://people.gnome.org/~walters/docs/build-api.txt
+echo \#buildapi-variable-no-builddir >/dev/null
+
dnl This is for the autoconf tests only - it set's the language we use
AC_LANG(C)
--
1.7.6.5

26
gnomeos/3.4/e-d-s-vala.patch
View File

@ -1,26 +0,0 @@
From d09173b7f9116dce51a19c557f26736f01d02da9 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 19 Jan 2012 15:21:09 -0500
Subject: [PATCH] vala: Add missing --pkg libxml-2.0
EDataServer-1.2.gir depends on libxml2, so we need to tell vapigen
that as well.
---
vala/Makefile.am | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/vala/Makefile.am b/vala/Makefile.am
index 3c35ede..ed4a574 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -24,6 +24,7 @@ pkgconfigdir = ${libdir}/pkgconfig
libedataserver-1.2.vapi: $(top_builddir)/libedataserver/EDataServer-1.2.gir
$(VAPIGEN_V)$(VAPIGEN) \
--pkg gio-2.0 \
+ --pkg libxml-2.0 \
--library libedataserver-1.2 \
--metadatadir=$(srcdir) \
$< \
--
1.7.6.5

137
gnomeos/3.4/expat-autogen.patch
View File

@ -1,137 +0,0 @@
From c5051be9cc07c307c45f32b7e8d6b2ec4949dffd Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 8 Jan 2012 11:08:26 -0500
Subject: [PATCH] Add autogen.sh to implement GNOME Build API, delete
buildconf.sh
Delete buildconf.sh since does broken hacks looking for libtool.m4;
autoreconf should be enough now.
See http://people.gnome.org/~walters/docs/build-api.txt
---
autogen.sh | 3 ++
buildconf.sh | 102 ----------------------------------------------------------
2 files changed, 3 insertions(+), 102 deletions(-)
create mode 100755 autogen.sh
delete mode 100755 buildconf.sh
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..c0d2e78
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+exec autoreconf -vfi
diff --git a/buildconf.sh b/buildconf.sh
deleted file mode 100755
index 2fc5932..0000000
--- a/buildconf.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /bin/sh
-
-#--------------------------------------------------------------------------
-# autoconf 2.52 or newer
-#
-ac_version="`${AUTOCONF:-autoconf} --version 2> /dev/null | head -1 | sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`"
-if test -z "$ac_version"; then
- echo "ERROR: autoconf not found."
- echo " You need autoconf version 2.52 or newer installed."
- exit 1
-fi
-IFS=.; set $ac_version; IFS=' '
-if test "$1" = "2" -a "$2" -lt "52" || test "$1" -lt "2"; then
- echo "ERROR: autoconf version $ac_version found."
- echo " You need autoconf version 2.52 or newer installed."
- exit 1
-fi
-
-echo "found: autoconf version $ac_version (ok)"
-
-#--------------------------------------------------------------------------
-# libtool 1.4 or newer
-#
-
-#
-# find libtoolize, or glibtoolize on MacOS X
-#
-libtoolize=`conftools/PrintPath glibtoolize libtoolize`
-if [ "x$libtoolize" = "x" ]; then
- echo "ERROR: libtoolize not found."
- echo " You need libtool version 1.4 or newer installed"
- exit 1
-fi
-
-lt_pversion="`$libtoolize --version 2> /dev/null | sed -e 's/^[^0-9]*//'`"
-
-# convert something like 1.4p1 to 1.4.p1
-lt_version="`echo $lt_pversion | sed -e 's/\([a-z]*\)$/.\1/'`"
-
-IFS=.; set $lt_version; IFS=' '
-if test "$1" = "1" -a "$2" -lt "4"; then
- echo "ERROR: libtool version $lt_pversion found."
- echo " You need libtool version 1.4 or newer installed"
- exit 1
-fi
-
-echo "found: libtool version $lt_pversion (ok)"
-
-#--------------------------------------------------------------------------
-
-# Remove any libtool files so one can switch between libtool 1.3
-# and libtool 1.4 by simply rerunning the buildconf script.
-(cd conftools/; rm -f ltmain.sh ltconfig)
-
-#
-# Create the libtool helper files
-#
-echo "Copying libtool helper files ..."
-
-#
-# Note: we don't use --force (any more) since we have a special
-# config.guess/config.sub that we want to ensure is used.
-#
-# --copy to avoid symlinks; we want originals for the distro
-# --automake to make it shut up about "things to do"
-#
-$libtoolize --copy --automake
-
-#
-# Find the libtool.m4 file. The developer/packager can set the LIBTOOL_M4
-# environment variable to specify its location. If that variable is not
-# set, then we'll assume a "standard" libtool installation and try to
-# derive its location.
-#
-ltpath=`dirname $libtoolize`
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-cp $ltfile conftools/libtool.m4
-
-echo "Using libtool.m4 from ${ltfile}."
-
-#--------------------------------------------------------------------------
-
-### for a little while... remove stray aclocal.m4 files from
-### developers' working copies. we no longer use it. (nothing else
-### will remove it, and leaving it creates big problems)
-rm -f aclocal.m4
-
-#
-# Generate the autoconf header template (expat_config.h.in) and ./configure
-#
-echo "Creating expat_config.h.in ..."
-${AUTOHEADER:-autoheader}
-
-echo "Creating configure ..."
-### do some work to toss config.cache?
-${AUTOCONF:-autoconf}
-
-# toss this; it gets created by autoconf on some systems
-rm -rf autom4te*.cache
-
-# exit with the right value, so any calling script can continue
-exit 0
--
1.7.6.4

26
gnomeos/3.4/folks-builddir.patch
View File

@ -1,26 +0,0 @@
From acb681c2d0db4dd8b8b26dc0ba80d70cd5cbc325 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 19 Jan 2012 15:40:14 -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 bb45b05..7853362 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,9 @@ AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-define
no-dist-gzip tar-ustar -Wno-portability])
AM_MAINTAINER_MODE([enable])
+dnl http://people.gnome.org/~walters/docs/build-api.txt
+echo \#buildapi-variable-no-builddir >/dev/null
+
AC_PROG_CC
AM_PROG_CC_C_O
AC_DISABLE_STATIC
--
1.7.6.5

30
gnomeos/3.4/folks-config-fatal-warnings.patch
View File

@ -1,30 +0,0 @@
From b39dcc98ea5588fa7affe2272fdc0ecebc713b1c Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 20 Jan 2012 12:24:59 -0500
Subject: [PATCH] build: Add --disable-fatal-warnings configure flag
Useful for builders who aren't necessarily developers.
---
configure.ac | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7ca2800..758ff63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -472,7 +472,11 @@ AC_SUBST([CODE_COVERAGE_CFLAGS])
AC_SUBST([CODE_COVERAGE_LDFLAGS])
# Vala-related flags
-AS_IF([test "x$enable_vala" = "xyes"],
+AC_ARG_ENABLE([fatal-warnings],
+ AS_HELP_STRING([--disable-fatal-warnings],
+ [Make warnings from valac and g-ir-scanner non-fatal]),
+ [enable_fatal_warnings=$enableval], [enable_fatal_warnings=yes])
+AS_IF([test "x$enable_vala" = "xyes" && test "x$enable_fatal_warnings" = "xyes"],
[ERROR_INTROSPECTION_SCANNER_ARGS="\
$ERROR_INTROSPECTION_SCANNER_ARGS --warn-error"
ERROR_VALAFLAGS="$ERROR_VALAFLAGS --fatal-warnings"])
--
1.7.6.5

36
gnomeos/3.4/folks-vala-0.14.patch
View File

@ -1,36 +0,0 @@
From 785f5a87fde722b459f0dd7edd6788b825156586 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 19 Jan 2012 18:14:11 -0500
Subject: [PATCH] Use vala 0.14 explicitly
---
configure.ac | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7b56633..1d39805 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,15 +242,10 @@ if test \
fi
if test "x$enable_vala" = "xyes" ; then
- AM_PROG_VALAC([$VALA_REQUIRED])
- if test "x$VALAC" = "x"; then
- AC_MSG_ERROR([Vala requested but valac is not installed])
- fi
-
- AC_PATH_PROG([VAPIGEN], [vapigen], [])
- if test "x$VAPIGEN" = "x"; then
- AC_MSG_ERROR([Vala must be built with --enable-vapigen])
- fi
+ VALAC=vala-0.14
+ AC_SUBST(VALAC)
+ VAPIGEN=valapigen-0.14
+ AC_SUBST(VAPIGEN)
# require GLib >= 2.24 so GLib.Array, etc. reffing is handled
# automatically
--
1.7.6.5

142
gnomeos/3.4/folks-vala-0.16.patch
View File

@ -1,142 +0,0 @@
From 6b1c7810953aa19a7ac6c9955398442c548abe85 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 20 Jan 2012 14:46:14 -0500
Subject: [PATCH] Build with vala 0.15
---
backends/key-file/kf-persona-store.vala | 6 +++---
folks/backend-store.vala | 16 ++++++++--------
folks/object-cache.vala | 6 +++---
tests/folks/backend-loading.vala | 6 +++---
tests/lib/eds/backend.vala | 2 +-
tools/inspect/inspect.vala | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/backends/key-file/kf-persona-store.vala b/backends/key-file/kf-persona-store.vala
index 0d2bb53..5f75d56 100644
--- a/backends/key-file/kf-persona-store.vala
+++ b/backends/key-file/kf-persona-store.vala
@@ -450,9 +450,9 @@ public class Folks.Backends.Kf.PersonaStore : Folks.PersonaStore
* Vala <= 0.10, it returned the character length). FIXME: We need to
* take this into account until we depend explicitly on
* Vala >= 0.11. */
- yield this.file.replace_contents_async (key_file_data,
- key_file_data.length, null, false, FileCreateFlags.PRIVATE,
- cancellable);
+ yield this.file.replace_contents_async (key_file_data.data,
+ null, false, FileCreateFlags.PRIVATE,
+ cancellable, null);
}
catch (Error e)
{
diff --git a/folks/backend-store.vala b/folks/backend-store.vala
index a00bf19..9d28f9b 100644
--- a/folks/backend-store.vala
+++ b/folks/backend-store.vala
@@ -537,10 +537,10 @@ public class Folks.BackendStore : Object {
debug ("Searching for modules in folder '%s' ..", dir.get_path ());
var attributes =
- FILE_ATTRIBUTE_STANDARD_NAME + "," +
- FILE_ATTRIBUTE_STANDARD_TYPE + "," +
- FILE_ATTRIBUTE_STANDARD_IS_SYMLINK + "," +
- FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE;
+ FileAttribute.STANDARD_NAME + "," +
+ FileAttribute.STANDARD_TYPE + "," +
+ FileAttribute.STANDARD_IS_SYMLINK + "," +
+ FileAttribute.STANDARD_CONTENT_TYPE;
GLib.List<FileInfo> infos;
try
@@ -675,7 +675,7 @@ public class Folks.BackendStore : Object {
{
/* Query for the MIME type; if the file doesn't exist, we'll get an
* appropriate error back, so this also checks for existence. */
- file_info = yield file.query_info_async (FILE_ATTRIBUTE_STANDARD_TYPE,
+ file_info = yield file.query_info_async (FileAttribute.STANDARD_TYPE,
FileQueryInfoFlags.NONE, Priority.DEFAULT, null);
}
catch (Error error)
@@ -766,9 +766,9 @@ public class Folks.BackendStore : Object {
* Vala <= 0.10, it returned the character length). FIXME: We need to
* take this into account until we depend explicitly on
* Vala >= 0.11. */
- yield this._config_file.replace_contents_async (key_file_data,
- key_file_data.length, null, false, FileCreateFlags.PRIVATE,
- null);
+ yield this._config_file.replace_contents_async (key_file_data.data,
+ null, false, FileCreateFlags.PRIVATE,
+ null, null);
}
catch (Error e)
{
diff --git a/folks/object-cache.vala b/folks/object-cache.vala
index c9adb85..52f518f 100644
--- a/folks/object-cache.vala
+++ b/folks/object-cache.vala
@@ -194,7 +194,7 @@ public abstract class Folks.ObjectCache<T> : Object
try
{
- yield this._cache_file.load_contents_async (cancellable, out data);
+ yield this._cache_file.load_contents_async (cancellable, out data, null);
}
catch (Error e)
{
@@ -372,8 +372,8 @@ public abstract class Folks.ObjectCache<T> : Object
try
{
yield this._cache_file.replace_contents_async (
- (string) data, data.length, null, false,
- FileCreateFlags.PRIVATE, cancellable);
+ data, null, false,
+ FileCreateFlags.PRIVATE, cancellable, null);
break;
}
catch (Error e)
diff --git a/tests/folks/backend-loading.vala b/tests/folks/backend-loading.vala
index 1dbcddb..d8f02f8 100644
--- a/tests/folks/backend-loading.vala
+++ b/tests/folks/backend-loading.vala
@@ -59,9 +59,9 @@ public class BackendLoadingTests : Folks.TestCase
{
File backend_f = File.new_for_path (kf_path);
string data = kf.to_data ();
- backend_f.replace_contents (data,
- data.length, null, false, FileCreateFlags.PRIVATE,
- null);
+ backend_f.replace_contents (data.data,
+ null, false, FileCreateFlags.PRIVATE,
+ null, null);
}
catch (Error e)
{
diff --git a/tests/lib/eds/backend.vala b/tests/lib/eds/backend.vala
index 7bc0ea4..b004973 100644
--- a/tests/lib/eds/backend.vala
+++ b/tests/lib/eds/backend.vala
@@ -225,7 +225,7 @@ public class EdsTest.Backend
try
{
- file.load_contents (null, out photo_content);
+ file.load_contents (null, out photo_content, null);
var cp = new ContactPhoto ();
cp.type = ContactPhotoType.INLINED;
diff --git a/tools/inspect/inspect.vala b/tools/inspect/inspect.vala
index c69356b..1e3eaed 100644
--- a/tools/inspect/inspect.vala
+++ b/tools/inspect/inspect.vala
@@ -299,7 +299,7 @@ public class Folks.Inspect.Client : Object
}
}
-private abstract class Folks.Inspect.Command
+public abstract class Folks.Inspect.Command
{
protected Client client;
--
1.7.6.5

26
gnomeos/3.4/fontconfig-autogen.patch
View File

@ -1,26 +0,0 @@
From 3582884f5b6246c06d60bd4abd986713b4c4c05d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 6 Jan 2012 19:42:12 -0500
Subject: [PATCH] autogen.sh: Honor NOCONFIGURE environment variable
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 820c457..f534bdd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -114,7 +114,7 @@ echo Running $AUTOCONF
$AUTOCONF
cd $ORIGDIR
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
+if test -z "$AUTOGEN_SUBDIR_MODE" && test -z "$NOCONFIGURE"; then
echo Running $srcdir/configure --enable-maintainer-mode "$@"
$srcdir/configure --enable-maintainer-mode "$@"
--
1.7.6.4

298
gnomeos/3.4/freetype-autogen.patch
View File

@ -1,298 +0,0 @@
From 7bb9f72d9fa34cd0c9fd2101d8170693d46c66dd Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 6 Jan 2012 18:41:56 -0500
Subject: [PATCH] build: Ensure autogen.sh is run if building from git
The GNOME Build API prefers 'configure' over 'autogen.sh' if it
exists, but in this build system 'configure' isn't usable until
'autogen.sh' is run. Work around this by making the stub
configure be 'configure.stub', and rename it once autogen.sh
is complete.
---
autogen.sh | 1 +
configure | 125 --------------------------------------------------------
configure.stub | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 126 insertions(+), 125 deletions(-)
mode change 100644 => 100755 autogen.sh
delete mode 100755 configure
create mode 100755 configure.stub
diff --git a/autogen.sh b/autogen.sh
old mode 100644
new mode 100755
index 9f2fb6a..57c9586
--- a/autogen.sh
+++ b/autogen.sh
@@ -161,6 +161,7 @@ chmod +x install-sh
cd ../..
+mv configure.stub configure
chmod +x ./configure
# EOF
diff --git a/configure b/configure
deleted file mode 100755
index b397556..0000000
--- a/configure
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT. By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-#
-#
-# Call the `configure' script located in `builds/unix'.
-#
-
-rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
-
-if test "x$GNUMAKE" = x; then
- GNUMAKE=make
-fi
-
-if test -z "`$GNUMAKE -v 2>/dev/null | grep GNU`"; then
- if test -z "`$GNUMAKE -v 2>/dev/null | grep makepp`"; then
- echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build FreeType2." >&2
- echo "Please try" >&2
- echo " \`GNUMAKE=<GNU make command name> $0'." >&2
- echo "or >&2"
- echo " \`GNUMAKE=\"makepp --norc-substitution\" $0'." >&2
- exit 1
- fi
-fi
-
-# Get `dirname' functionality. This is taken and adapted from autoconf's
-# m4sh.m4 (_AS_EXPR_PREPARE, AS_DIRNAME_EXPR, and AS_DIRNAME_SED).
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
- ft_expr=expr
-else
- ft_expr=false
-fi
-
-ft2_dir=`(dirname "$0") 2>/dev/null ||
- $ft_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
- echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
-abs_curr_dir=`pwd`
-abs_ft2_dir=`cd "$ft2_dir" && pwd`
-
-# `--srcdir=' option can override abs_ft2_dir
-
-if test $# -gt 0; then
- for x in "$@"; do
- case x"$x" in
- x--srcdir=*)
- abs_ft2_dir=`echo $x | sed 's/^--srcdir=//'` ;;
- esac
- done
-fi
-
-# build a dummy Makefile if we are not building in the source tree;
-# we use inodes to avoid issues with symbolic links
-inode_src=`ls -id $abs_ft2_dir | awk '{print $1}'`
-inode_dst=`ls -id $abs_curr_dir | awk '{print $1}'`
-
-if test $inode_src -ne $inode_dst; then
- if test ! -d reference; then
- mkdir reference
- fi
- if test ! -r $abs_curr_dir/modules.cfg; then
- echo "Copying \`modules.cfg'"
- cp $abs_ft2_dir/modules.cfg $abs_curr_dir
- fi
- echo "Generating \`Makefile'"
- echo "TOP_DIR := $abs_ft2_dir" > Makefile
- echo "OBJ_DIR := $abs_curr_dir" >> Makefile
- echo "OBJ_BUILD := \$(OBJ_DIR)" >> Makefile
- echo "DOC_DIR := \$(OBJ_DIR)/reference" >> Makefile
- echo "FT_LIBTOOL_DIR := \$(OBJ_DIR)" >> Makefile
- echo "ifndef FT2DEMOS" >> Makefile
- echo " include \$(TOP_DIR)/Makefile" >> Makefile
- echo "else" >> Makefile
- echo " TOP_DIR_2 := \$(TOP_DIR)/../ft2demos" >> Makefile
- echo " PROJECT := freetype" >> Makefile
- echo " CONFIG_MK := \$(OBJ_DIR)/config.mk" >> Makefile
- echo " include \$(TOP_DIR_2)/Makefile" >> Makefile
- echo "endif" >> Makefile
-fi
-
-# call make
-
-CFG=
-# work around zsh bug which doesn't like `${1+"$@"}'
-case $# in
-0) ;;
-*) for x in "$@"; do
- case x"$x" in
- x--srcdir=* ) CFG="$CFG '$x'/builds/unix" ;;
- *) CFG="$CFG '$x'" ;;
- esac
- done ;;
-esac
-CFG=$CFG $GNUMAKE setup unix
-
-# eof
diff --git a/configure.stub b/configure.stub
new file mode 100755
index 0000000..b397556
--- /dev/null
+++ b/configure.stub
@@ -0,0 +1,125 @@
+#!/bin/sh
+#
+# Copyright 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT. By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+#
+#
+# Call the `configure' script located in `builds/unix'.
+#
+
+rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
+
+if test "x$GNUMAKE" = x; then
+ GNUMAKE=make
+fi
+
+if test -z "`$GNUMAKE -v 2>/dev/null | grep GNU`"; then
+ if test -z "`$GNUMAKE -v 2>/dev/null | grep makepp`"; then
+ echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build FreeType2." >&2
+ echo "Please try" >&2
+ echo " \`GNUMAKE=<GNU make command name> $0'." >&2
+ echo "or >&2"
+ echo " \`GNUMAKE=\"makepp --norc-substitution\" $0'." >&2
+ exit 1
+ fi
+fi
+
+# Get `dirname' functionality. This is taken and adapted from autoconf's
+# m4sh.m4 (_AS_EXPR_PREPARE, AS_DIRNAME_EXPR, and AS_DIRNAME_SED).
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+ ft_expr=expr
+else
+ ft_expr=false
+fi
+
+ft2_dir=`(dirname "$0") 2>/dev/null ||
+ $ft_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+ echo X"$0" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+
+abs_curr_dir=`pwd`
+abs_ft2_dir=`cd "$ft2_dir" && pwd`
+
+# `--srcdir=' option can override abs_ft2_dir
+
+if test $# -gt 0; then
+ for x in "$@"; do
+ case x"$x" in
+ x--srcdir=*)
+ abs_ft2_dir=`echo $x | sed 's/^--srcdir=//'` ;;
+ esac
+ done
+fi
+
+# build a dummy Makefile if we are not building in the source tree;
+# we use inodes to avoid issues with symbolic links
+inode_src=`ls -id $abs_ft2_dir | awk '{print $1}'`
+inode_dst=`ls -id $abs_curr_dir | awk '{print $1}'`
+
+if test $inode_src -ne $inode_dst; then
+ if test ! -d reference; then
+ mkdir reference
+ fi
+ if test ! -r $abs_curr_dir/modules.cfg; then
+ echo "Copying \`modules.cfg'"
+ cp $abs_ft2_dir/modules.cfg $abs_curr_dir
+ fi
+ echo "Generating \`Makefile'"
+ echo "TOP_DIR := $abs_ft2_dir" > Makefile
+ echo "OBJ_DIR := $abs_curr_dir" >> Makefile
+ echo "OBJ_BUILD := \$(OBJ_DIR)" >> Makefile
+ echo "DOC_DIR := \$(OBJ_DIR)/reference" >> Makefile
+ echo "FT_LIBTOOL_DIR := \$(OBJ_DIR)" >> Makefile
+ echo "ifndef FT2DEMOS" >> Makefile
+ echo " include \$(TOP_DIR)/Makefile" >> Makefile
+ echo "else" >> Makefile
+ echo " TOP_DIR_2 := \$(TOP_DIR)/../ft2demos" >> Makefile
+ echo " PROJECT := freetype" >> Makefile
+ echo " CONFIG_MK := \$(OBJ_DIR)/config.mk" >> Makefile
+ echo " include \$(TOP_DIR_2)/Makefile" >> Makefile
+ echo "endif" >> Makefile
+fi
+
+# call make
+
+CFG=
+# work around zsh bug which doesn't like `${1+"$@"}'
+case $# in
+0) ;;
+*) for x in "$@"; do
+ case x"$x" in
+ x--srcdir=* ) CFG="$CFG '$x'/builds/unix" ;;
+ *) CFG="$CFG '$x'" ;;
+ esac
+ done ;;
+esac
+CFG=$CFG $GNUMAKE setup unix
+
+# eof
--
1.7.6.4

47
gnomeos/3.4/g-c-c-disable-docs.patch
View File

@ -1,47 +0,0 @@
From b9c16442af191dfb2df3f7a554946990c2519d99 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 21 Jan 2012 11:10:42 -0500
Subject: [PATCH] build: Add a --disable-documentation option
Allows OS builders to bootstrap more easily.
---
Makefile.am | 6 +++++-
configure.ac | 4 ++++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 4931964..05d5b3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,12 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = po shell panels help
+SUBDIRS = po shell panels
DIST_SUBDIRS = po help shell panels
+if ENABLE_DOCUMENTATION
+SUBDIRS += help
+endif
+
DISTCLEANFILES = \
gnome-doc-utils.make
diff --git a/configure.ac b/configure.ac
index a37af2a..c2cc6dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,10 @@ AC_HEADER_STDC
LT_PREREQ([2.2])
LT_INIT
+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)
# Use the GNOME documentation framework
GNOME_DOC_INIT
--
1.7.6.5

58
gnomeos/3.4/gdm-debug-prints.patch
View File

@ -1,58 +0,0 @@
From f69ea96257d7ff6b1a90e63e6597f0c49e4b0288 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 29 Apr 2012 09:04:02 -0400
Subject: [PATCH 2/3] daemon: Add some more PAM g_debug() prints
Hopefully helpful later for whoever has to debug PAM stuff.
https://bugzilla.gnome.org/show_bug.cgi?id=675086
---
daemon/gdm-session-worker.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index 57f1071..28f0cb0 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -1084,7 +1084,10 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
g_assert (worker->priv->pam_handle == NULL);
- g_debug ("GdmSessionWorker: initializing PAM");
+ g_debug ("GdmSessionWorker: initializing PAM; service=%s username=%s seat=%s",
+ service ? service : "(null)",
+ username ? username : "(null)",
+ seat_id ? seat_id : "(null)");
pam_conversation.conv = (GdmSessionWorkerPamNewMessagesFunc) gdm_session_worker_pam_new_messages_handler;
pam_conversation.appdata_ptr = worker;
@@ -1273,7 +1276,8 @@ gdm_session_worker_authorize_user (GdmSessionWorker *worker,
int error_code;
int authentication_flags;
- g_debug ("GdmSessionWorker: determining if authenticated user is authorized to session");
+ g_debug ("GdmSessionWorker: determining if authenticated user (password required:%d) is authorized to session",
+ password_is_required);
authentication_flags = 0;
@@ -1288,6 +1292,7 @@ gdm_session_worker_authorize_user (GdmSessionWorker *worker,
/* it's possible that the user needs to change their password or pin code
*/
if (error_code == PAM_NEW_AUTHTOK_REQD && !worker->priv->is_program_session) {
+ g_debug ("GdmSessionWorker: authenticated user requires new auth token");
error_code = pam_chauthtok (worker->priv->pam_handle, PAM_CHANGE_EXPIRED_AUTHTOK);
gdm_session_worker_get_username (worker, NULL);
@@ -1664,7 +1669,7 @@ session_worker_child_watch (GPid pid,
static void
gdm_session_worker_watch_child (GdmSessionWorker *worker)
{
-
+ g_debug ("GdmSession worker: watching pid %d", worker->priv->child_pid);
worker->priv->child_watch_id = g_child_watch_add (worker->priv->child_pid,
(GChildWatchFunc)session_worker_child_watch,
worker);
--
1.7.7.6

53
gnomeos/3.4/gdm-disable-documentation.patch
View File

@ -1,53 +0,0 @@
From ddd83d47165c73e4678f666986abdb6f3f0b8223 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 15 Jan 2012 16:49:07 -0500
Subject: [PATCH 1/3] build: Add --disable-documentation
Documentation is the source of many cyclical build loops. Allow
operating system builders to manually cut these cycles initially
by disabling documentation for a first pass.
https://bugzilla.gnome.org/show_bug.cgi?id=675087
---
Makefile.am | 4 +++-
configure.ac | 4 ++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f522f40..2d0443d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,12 +4,14 @@ SUBDIRS = \
data \
common \
daemon \
- docs \
gui \
utils \
po \
tests \
$(NULL)
+if ENABLE_DOCUMENTATION
+SUBDIRS += docs
+endif
# add these when help gets added back
# omf-install
diff --git a/configure.ac b/configure.ac
index c35ad8c..35e6e04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,10 @@ AC_CONFIG_MACRO_DIR([m4])
IT_PROG_INTLTOOL([0.40.0])
GNOME_DOC_INIT
+AC_ARG_ENABLE([documentation],
+ AS_HELP_STRING([--enable-documentation], [enable man pages and HTML documentation]),
+ [], [enable_documentation=yes])
+AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
GETTEXT_PACKAGE=gdm
AC_SUBST(GETTEXT_PACKAGE)
--
1.7.7.6

282
gnomeos/3.4/gdm-pam-config.patch
View File

@ -1,282 +0,0 @@
From 5239bd5782ba083f30d3667e038b7c44f2f579c9 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 27 Apr 2012 18:34:39 -0400
Subject: [PATCH 3/3] Add --with-default-pam-config option
The PAM files that ship with GDM are really specific to Red Hat's
historical fork of pam. For example, the "system-auth" file still
lives in the Fedora 17 "pam" git.
Add new PAM files (which may still not work for everybody, but hey,
it's a starting point) that should be somewhat useful for people who
build with "Linux PAM" upstream, which uses "common-*" prefixes.
The default is still to use the Red Hat PAM files for backwards
compatibility.
https://bugzilla.gnome.org/show_bug.cgi?id=675085
---
configure.ac | 17 +++++++++++++++++
data/Makefile.am | 33 +++++++++++++++++++++------------
data/gdm | 12 ------------
data/gdm-autologin | 10 ----------
data/gdm-welcome | 9 ---------
data/pam-linux/gdm | 12 ++++++++++++
data/pam-linux/gdm-autologin | 10 ++++++++++
data/pam-linux/gdm-welcome | 9 +++++++++
data/pam-redhat/gdm | 12 ++++++++++++
data/pam-redhat/gdm-autologin | 10 ++++++++++
data/pam-redhat/gdm-welcome | 9 +++++++++
11 files changed, 100 insertions(+), 43 deletions(-)
delete mode 100644 data/gdm
delete mode 100644 data/gdm-autologin
delete mode 100644 data/gdm-welcome
create mode 100644 data/pam-linux/gdm
create mode 100644 data/pam-linux/gdm-autologin
create mode 100644 data/pam-linux/gdm-welcome
create mode 100644 data/pam-redhat/gdm
create mode 100644 data/pam-redhat/gdm-autologin
create mode 100644 data/pam-redhat/gdm-welcome
diff --git a/configure.ac b/configure.ac
index 35e6e04..21e44e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -226,6 +226,23 @@ if test x$enable_split_authentication = xyes; then
AC_DEFINE(ENABLE_SPLIT_AUTHENTICATION, 1, [Define if split authentication is enabled])
fi
+AC_ARG_WITH(default-pam-config,
+ AS_HELP_STRING([--with-default-pam-config: One of redhat, linux @<:@default=redhat@:>@]),
+ with_default_pam_config=${withval}, with_default_pam_config=redhat)
+case x$with_default_pam_config in
+ xredhat|xlinux) ;;
+ *)
+ AC_MSG_ERROR([Invalid --with-default-pam-config ${with_default_pam_config}])
+ exit 1
+ ;;
+esac
+AM_CONDITIONAL(ENABLE_REDHAT_PAM_CONFIG, test x$with_default_pam_config = xredhat)
+AM_CONDITIONAL(ENABLE_LINUX_PAM_CONFIG, test x$with_default_pam_config = xlinux)
+
+if test x$enable_split_authentication = xyes; then
+ AC_DEFINE(ENABLE_SPLIT_AUTHENTICATION, 1, [Define if split authentication is enabled])
+fi
+
AC_ARG_ENABLE(console-helper,
AS_HELP_STRING([--enable-console-helper],
[Enable PAM console helper @<:@default=auto@:>@]),,
diff --git a/data/Makefile.am b/data/Makefile.am
index f0d00bf..e940d71 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,6 @@
NULL =
+EXTRA_DIST =
SUBDIRS = \
applications \
pixmaps \
@@ -97,7 +98,19 @@ gdm-smartcard: gdm-smartcard.pam
pamdir = $(PAM_PREFIX)/pam.d
pam_DATA = gdm-fingerprint gdm-smartcard
-EXTRA_DIST = \
+pam_redhat_files = pam-redhat/gdm pam-redhat/gdm-autologin pam-redhat/gdm-welcome
+EXTRA_DIST += $(pam_redhat_files)
+pam_linux_files = pam-linux/gdm pam-linux/gdm-autologin pam-linux/gdm-welcome
+EXTRA_DIST += $(pam_linux_files)
+
+if ENABLE_REDHAT_PAM_CONFIG
+pam_files = $(pam_redhat_files)
+endif
+if ENABLE_LINUX_PAM_CONFIG
+pam_files = $(pam_linux_files)
+endif
+
+EXTRA_DIST += \
$(schemas_in_files) \
$(schemas_DATA) \
$(dbusconf_in_files) \
@@ -105,9 +118,6 @@ EXTRA_DIST = \
gdm.schemas.in.in \
gdm.conf-custom.in \
Xsession.in \
- gdm \
- gdm-autologin \
- gdm-welcome \
gdm-fingerprint.pam \
gdm-smartcard.pam \
gdm-fallback.session \
@@ -233,14 +243,13 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession 00-upstr
$(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \
chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
fi; \
- if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm; then \
- $(INSTALL_DATA) $(srcdir)/gdm $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm; \
- fi; \
- if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; then \
- $(INSTALL_DATA) $(srcdir)/gdm-autologin $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; \
- fi; \
- if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-welcome; then \
- $(INSTALL_DATA) $(srcdir)/gdm-welcome $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-welcome; \
+ if test $$system = Linux; then \
+ for file in $(pam_files); do \
+ bn=$$(basename $$file); \
+ if test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/$$bn; then \
+ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(PAM_PREFIX)/pam.d/$$bn; \
+ fi; \
+ done; \
fi; \
if test $$system = SunOS; then \
echo "Please add PAM authentication for gdm, gdm-autologin and gdm-welcome in $(PAM_PREFIX)/pam.conf!"; \
diff --git a/data/gdm b/data/gdm
deleted file mode 100644
index 58c397d..0000000
--- a/data/gdm
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-auth required pam_env.so
-auth required pam_succeed_if.so user != root quiet
-auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
-auth include system-auth
-account required pam_nologin.so
-account include system-auth
-password include system-auth
-session optional pam_keyinit.so force revoke
-session include system-auth
-session required pam_loginuid.so
-session optional pam_console.so
diff --git a/data/gdm-autologin b/data/gdm-autologin
deleted file mode 100644
index c4e598a..0000000
--- a/data/gdm-autologin
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth required pam_env.so
-auth required pam_permit.so
-account required pam_nologin.so
-account include system-auth
-password include system-auth
-session optional pam_keyinit.so force revoke
-session include system-auth
-session required pam_loginuid.so
-session optional pam_console.so
diff --git a/data/gdm-welcome b/data/gdm-welcome
deleted file mode 100644
index b301f4f..0000000
--- a/data/gdm-welcome
+++ /dev/null
@@ -1,9 +0,0 @@
-#%PAM-1.0
-auth required pam_env.so
-auth required pam_permit.so
-account required pam_nologin.so
-account include system-auth
-password include system-auth
-session required pam_loginuid.so
-session optional pam_keyinit.so force revoke
-session include system-auth
diff --git a/data/pam-linux/gdm b/data/pam-linux/gdm
new file mode 100644
index 0000000..de223de
--- /dev/null
+++ b/data/pam-linux/gdm
@@ -0,0 +1,12 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_succeed_if.so user != root quiet
+auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
+auth include common-auth
+account required pam_nologin.so
+account include common-account
+password include common-password
+session optional pam_keyinit.so force revoke
+session include common-session
+session required pam_loginuid.so
+session optional pam_console.so
diff --git a/data/pam-linux/gdm-autologin b/data/pam-linux/gdm-autologin
new file mode 100644
index 0000000..32d5248
--- /dev/null
+++ b/data/pam-linux/gdm-autologin
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account required pam_nologin.so
+account include common-auth
+password include common-auth
+session optional pam_keyinit.so force revoke
+session include common-session
+session required pam_loginuid.so
+session optional pam_console.so
diff --git a/data/pam-linux/gdm-welcome b/data/pam-linux/gdm-welcome
new file mode 100644
index 0000000..602217b
--- /dev/null
+++ b/data/pam-linux/gdm-welcome
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account required pam_nologin.so
+account include common-account
+password include common-auth
+session required pam_loginuid.so
+session optional pam_keyinit.so force revoke
+session include common-session
diff --git a/data/pam-redhat/gdm b/data/pam-redhat/gdm
new file mode 100644
index 0000000..58c397d
--- /dev/null
+++ b/data/pam-redhat/gdm
@@ -0,0 +1,12 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_succeed_if.so user != root quiet
+auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
+auth include system-auth
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session optional pam_keyinit.so force revoke
+session include system-auth
+session required pam_loginuid.so
+session optional pam_console.so
diff --git a/data/pam-redhat/gdm-autologin b/data/pam-redhat/gdm-autologin
new file mode 100644
index 0000000..c4e598a
--- /dev/null
+++ b/data/pam-redhat/gdm-autologin
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session optional pam_keyinit.so force revoke
+session include system-auth
+session required pam_loginuid.so
+session optional pam_console.so
diff --git a/data/pam-redhat/gdm-welcome b/data/pam-redhat/gdm-welcome
new file mode 100644
index 0000000..b301f4f
--- /dev/null
+++ b/data/pam-redhat/gdm-welcome
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_loginuid.so
+session optional pam_keyinit.so force revoke
+session include system-auth
--
1.7.7.6

26
gnomeos/3.4/gee-builddir.patch
View File

@ -1,26 +0,0 @@
From 2b42fa58fda13909ca7ef1b0b6e339324648d3f2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 19 Jan 2012 10:38:03 -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 c25cb8d..fab2de0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,9 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([check-news dist-bzip2])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+dnl http://people.gnome.org/~walters/docs/build-api.txt
+echo \#buildapi-variable-no-builddir >/dev/null
+
# Checks for programs.
AC_PROG_CC
AM_PROG_CC_C_O
--
1.7.6.5

26
gnomeos/3.4/gee-gir-version.patch
View File

@ -1,26 +0,0 @@
From a2e1aaedd48503f2f58fbe714a414d428cca4c70 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 20 Jan 2012 11:05:24 -0500
Subject: [PATCH] assemblyinfo: Use correct .gir version for 0.6 branch
(should be 1.0)
https://bugzilla.gnome.org/show_bug.cgi?id=666208
---
gee/assemblyinfo.vala | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gee/assemblyinfo.vala b/gee/assemblyinfo.vala
index 8f3474b..1fdde6d 100644
--- a/gee/assemblyinfo.vala
+++ b/gee/assemblyinfo.vala
@@ -20,6 +20,6 @@
* Maciej Piechotka <uzytkownik2@gmail.com>
*/
-[CCode (gir_namespace = "Gee", gir_version = "0.8")]
+[CCode (gir_namespace = "Gee", gir_version = "1.0")]
namespace Gee {}
--
1.7.6.5

51
gnomeos/3.4/gee-vala-0.15.patch
View File

@ -1,51 +0,0 @@
From 5e35da9f6bbcb99790efb8934c9651e93f095d7c Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 20 Jan 2012 09:49:49 -0500
Subject: [PATCH] Fix compilation with Vala 0.15
---
gee/priorityqueue.vala | 4 ++--
tests/testarraylist.vala | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gee/priorityqueue.vala b/gee/priorityqueue.vala
index 6c45238..e3e7a85 100644
--- a/gee/priorityqueue.vala
+++ b/gee/priorityqueue.vala
@@ -53,7 +53,7 @@ public class Gee.PriorityQueue<G> : Gee.AbstractQueue<G> {
private Type2Node<G>? _lm_head = null;
private Type2Node<G>? _lm_tail = null;
private Type1Node<G>? _p = null;
- private Type1Node<G>?[] _a = new Type1Node<G>[0];
+ private Type1Node<G>?[] _a = new Type1Node<G>?[0];
private NodePair<G>? _lp_head = null;
private NodePair<G>? _lp_tail = null;
private bool[] _b = new bool[0];
@@ -316,7 +316,7 @@ public class Gee.PriorityQueue<G> : Gee.AbstractQueue<G> {
_lm_head = null;
_lm_tail = null;
_p = null;
- _a = new Type1Node<G>[0];
+ _a = new Type1Node<G>?[0];
_lp_head = null;
_lp_tail = null;
_b = new bool[0];
diff --git a/tests/testarraylist.vala b/tests/testarraylist.vala
index e5340c5..05bc328 100644
--- a/tests/testarraylist.vala
+++ b/tests/testarraylist.vala
@@ -148,9 +148,9 @@ public class ArrayListTests : ListTests {
assert (double_list.add (1.5d));
assert (double_list.add (2.0d));
- double[] double_array = double_list.to_array ();
+ double?[] double_array = double_list.to_array ();
index = 0;
- foreach (double element in double_list) {
+ foreach (double? element in double_list) {
assert (element == double_array[index++]);
}
}
--
1.7.6.5

32
gnomeos/3.4/gnome-bluetooth-applet-la-file.patch
View File

@ -1,32 +0,0 @@
From ebee614641a9c3af11a2d860e75b1a564744b767 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 21 Jan 2012 10:11:54 -0500
Subject: [PATCH] applet: Delete gnome-bluetooth-applet.la file
For operating system creators who don't ship .la files in /usr/lib,
this file will still reference the (now non-existent)
libgnome-bluetooth.la.
This patch should be harmless for distributors who do still ship the
.la files though.
---
applet/Makefile-lib.am | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/applet/Makefile-lib.am b/applet/Makefile-lib.am
index 7f75083..e01c386 100644
--- a/applet/Makefile-lib.am
+++ b/applet/Makefile-lib.am
@@ -13,6 +13,9 @@ libgnome_bluetooth_applet_la_LDFLAGS = -no-undefined
AM_CFLAGS = -I$(srcdir) -I$(top_srcdir)/lib $(LIBGNOMEBT_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
+install-data-hook:
+ rm $(DESTDIR)$(pkglibdir)/libgnome-bluetooth-applet.la
+
include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
--
1.7.6.5

49
gnomeos/3.4/gnome-bluetooth-disable-docs.patch
View File

@ -1,49 +0,0 @@
From 2cd4a37078f416ff848c62b9df2239e21406aab8 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 18 Jan 2012 22:06:58 -0500
Subject: [PATCH] build: Add --disable-documentation option
This helps operating system builders.
---
Makefile.am | 9 ++++++++-
configure.ac | 5 +++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 9187597..64673bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,13 @@
DEF_SUBDIRS = icons lib applet wizard sendto docs po help
-SUBDIRS = icons lib applet wizard sendto $(MOBLIN_DIR) docs po help
+SUBDIRS = icons lib applet wizard sendto docs po
+DIST_SUBDIRS =
+
+if ENABLE_DOCUMENTATION
+SUBDIRS += help
+else
+DIST_SUBDIRS += help
+endif
EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make gnome-doc-utils.make
diff --git a/configure.ac b/configure.ac
index 869e3ed..6f2b5be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,6 +146,11 @@ GNOME_COMPILE_WARNINGS([maximum])
GNOME_CXX_WARNINGS
GNOME_MAINTAINER_MODE_DEFINES
+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)
+
GNOME_DOC_INIT
AC_OUTPUT(Makefile
--
1.7.6.5

52
gnomeos/3.4/gnome-doc-utils-no-docs.patch
View File

@ -1,52 +0,0 @@
From 8b4cb9d332b84db970bf446ad9576ad98ba448e5 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 14 Jan 2012 21:45:18 -0500
Subject: [PATCH] build: Add --disable-documentation option
This may sound weird for gnome-doc-utils, but basically I need a
way to bootstrap an operating system without documentation initially,
because it's the source of big dependency cycles.
This configure option is enough to get the m4 macros installed, and
then move from there to building GDM without documentation too.
---
configure.in | 5 +++++
xml2po/Makefile.am | 6 +++++-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/configure.in b/configure.in
index 15d97a4..dd56f21 100644
--- a/configure.in
+++ b/configure.in
@@ -21,6 +21,11 @@ AC_PROG_LN_S
gdu_cv_have_gdu=yes
GNOME_DOC_DEFINES
+AC_ARG_ENABLE([documentation],
+ AS_HELP_STRING([--enable-documentation], [enable documentation generated via XSLT]),
+ [], [enable_documentation=yes])
+AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
+
AC_ARG_ENABLE([build-utils],
AC_HELP_STRING([--enable-build-utils],
[build and install the build utilities [default=yes]]),,
diff --git a/xml2po/Makefile.am b/xml2po/Makefile.am
index 2f17f0b..4aff003 100644
--- a/xml2po/Makefile.am
+++ b/xml2po/Makefile.am
@@ -3,7 +3,11 @@ SUBDIRS = xml2po examples
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = xml2po.pc
-man_MANS = xml2po.1
+man_MANS =
+
+if ENABLE_DOCUMENTATION
+man_MANS += xml2po.1
+endif
$(srcdir)/README: README.in
sed -e "s/\@VERSION\@/@VERSION@/g" < README.in > README
--
1.7.6.4

44
gnomeos/3.4/gnome-terminal-disable-docs.patch
View File

@ -1,44 +0,0 @@
From 16bf30bf14daa0dfbccdf23bca3d65394145e58a Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 27 Jan 2012 08:34:25 -0500
Subject: [PATCH] build: Add --disable-documentation flag
Useful for operating system builders to avoid build cycles, and
also if one just doesn't want to ship the help files.
---
Makefile.am | 6 +++++-
configure.ac | 4 ++++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 27547fd..f96dffd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = src po help
+SUBDIRS = src po
+DIST_SUBDIRS = help
+if ENABLE_DOCUMENTATION
+SUBDIRS += $(DIST_SUBDIRS)
+endif
NULL =
diff --git a/configure.ac b/configure.ac
index 407dc01..9ffee92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,6 +159,10 @@ AC_SUBST([GTK_BUILDER_CONVERT_FLAGS])
# Documentation
# *************
+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)
GNOME_DOC_INIT
# ****************************
--
1.7.6.5

736
gnomeos/3.4/gnomeos-3.4-src.json
View File

@ -1,736 +0,0 @@
{
"prefix": "gnomeos-3.4",
"architectures": ["i686"],
"base": {
"name": "yocto",
"src": "cgwalters:poky"
},
"config-opts": ["--disable-static", "--disable-silent-rules"],
"vcsconfig": {"gnome": "git:git://git.gnome.org/",
"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/",
"fd-pulse": "git:git://anongit.freedesktop.org/git/pulseaudio/",
"fd-xdg": "git:git://anongit.freedesktop.org/git/xdg/",
"fd-p11": "git:git://anongit.freedesktop.org/git/p11-glue/",
"fd-gstreamer": "git:git://anongit.freedesktop.org/gstreamer/",
"fd-telepathy": "git:git://anongit.freedesktop.org/telepathy/",
"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/",
"netfilter": "git:git://git.netfilter.org/",
"cgwalters": "git:git://github.com/cgwalters/"},
"patches": {"src": "gnome:ostree",
"subdir": "gnomeos/3.4"},
"components": [
{"src": "cgwalters:ginitscripts",
"noarch": true},
{"src": "gnome:gtk-doc-stub",
"component": "devel",
"noarch": true},
{"src": "git:git://github.com/atgreen/libffi.git"},
{"src": "gnome:glib"},
{"src": "savannah:attr",
"branch": "v2.4.46",
"patches": ["attr-add-autogen.patch",
"attr-no-builddir.patch",
"attr-2.4.32-build.patch",
"attr-makeinstall.patch"]},
{"src": "savannah:acl",
"branch": "v2.2.51",
"patches": ["acl-add-autogen.patch",
"acl-no-builddir.patch",
"acl-2.2.39-build.patch",
"attr-makeinstall.patch"]},
{"src": "gnome:linux-user-chroot"},
{"src": "gnome:libxml2"},
{"src": "gnome:libxslt"},
{"src": "fd:pixman"},
{"src": "git:git://git.sv.nongnu.org/freetype/freetype2.git",
"branch": "VER-2-4-8",
"patches": ["freetype-autogen.patch"]},
{"src": "fd:fontconfig",
"branch": "2.8.0",
"patches": ["fontconfig-autogen.patch"]},
{"src": "fd:xorg/util/macros",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/bigreqsproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/compositeproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/damageproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/dmxproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/dri2proto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/evieproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/fontsproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/glproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/inputproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/kbproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/randrproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/recordproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/renderproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/resourceproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/scrnsaverproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/videoproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/xcmiscproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/xextproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/xf86bigfontproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/xf86dgaproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/xf86driproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/xf86miscproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/xf86vidmodeproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/xineramaproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/fixesproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/proto/xproto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libxtrans",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXau",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xcb/proto",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/font/util",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libfontenc",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xcb/pthread-stubs",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xcb/libxcb",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libX11",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXrender",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXfixes",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXext",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXfont",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXft",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXi",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXinerama",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libICE",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libSM",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXt",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXmu",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXpm",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXrandr",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXRes",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXtst",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXv",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXvMC",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXxf86dga",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libXxf86vm",
"patches": ["xorg-libXxf86vm-autogen.patch"]},
{"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"]},
{"src": "fd:xorg/lib/libxkbui",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/lib/libFS",
"patches": ["xorg-autogen.patch"]},
{"src": "git:git://libpng.git.sourceforge.net/gitroot/libpng/libpng",
"branch": "v1.5.7"},
{"src": "fd:cairo",
"branch": "1.10.2",
"config-opts": ["--disable-interpreter"]},
{"src": "gnome:gnome-common",
"component": "devel"},
{"src": "cgwalters:intltool-git-mirror",
"component": "devel"},
{"src": "gnome:gobject-introspection"},
{"src": "git:git://git.libusb.org/libusb.git",
"branch": "v1.0.8",
"patches": ["libusb-autogen.patch"]},
{"src": "git:git://github.com/gregkh/usbutils.git",
"branch": "v005",
"patches": ["usbutils-autogen.patch"]},
{"src": "fedora:hwdata.git",
"patches": ["hwdata-buildapi.patch",
"hwdata-no-spec-file.patch"]},
{"src": "cgwalters:texinfo-git-mirror",
"branch": "TEXI2HTML_1_82",
"config-opts": ["--disable-man-pages"],
"patches": ["texinfo-disable-man.patch"]},
{"src": "savannah:gperf.git",
"branch": "v3.0.4",
"patches": ["gperf-autotools.patch"]},
{"src": "git:git://git.kernel.org/pub/scm/linux/hotplug/udev.git",
"branch": "175",
"config-opts": ["--disable-documentation",
"--enable-udev_acl"],
"patches": ["udev-autogen.patch", "udev-docs.patch",
"udev-gudev-libtool.patch"]},
{"src": "cgwalters:expat-git-mirror.git",
"patches": ["expat-autogen.patch"]},
{"src": "fd-dbus:dbus",
"config-opts": ["--with-dbus-user=dbus",
"--enable-inotify",
"--disable-xml-docs",
"--disable-doxygen-docs",
"--disable-tests",
"--with-system-pid-file=/run/dbus.pid"],
"patches": ["dbus-xmlto-docs.patch"],
"setuid": ["/runtime/usr/libexec/dbus-daemon-launch-helper"]},
{"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/app/xkbcomp",
"patches": ["xkbcomp-autogen.patch"]},
{"src": "fd:xorg/app/xrandr",
"patches": ["xkbcomp-autogen.patch"]},
{"src": "fd:xkeyboard-config",
"config-opts": ["--with-xkb-rules-symlink=xorg",
"--with-xkb-base=/usr/share/X11/xkb"],
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/xserver",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/driver/xf86-input-keyboard",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/driver/xf86-input-mouse",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/driver/xf86-input-evdev",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/driver/xf86-video-cirrus",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/driver/xf86-video-intel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xorg/driver/xf86-video-vesa",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:xcb/util",
"component": "devel",
"patches": ["xorg-autogen.patch"]},
{"src": "fd:startup-notification",
"patches": ["startup-notification-autogen.patch"]},
{"src": "fd-dbus:dbus-glib",
"config-opts": ["--disable-gtk-doc"]},
{"src": "git:git://git.infradead.org/users/tgr/libnl.git",
"name": "libnl3"},
{"src": "cgwalters:nspr-tarballs-as-git"},
{"src": "cgwalters:sqlite-tarballs-as-git"},
{"src": "cgwalters:nss-tarballs-as-git",
"branch": "v3.13.4"},
{"src": "git:git://ozlabs.org/~paulus/ppp.git",
"patches": ["ppp-srcdir-builddir.patch", "ppp-destdir.patch"]},
{"src": "netfilter:iptables.git"},
{"src": "debian:pkg-dhcp/isc-dhcp.git",
"name": "isc-dhcp",
"branch": "upstream/4.2.2",
"patches": ["isc-dhcp-autogen.patch",
"isc-dhcp-delete-configure.patch",
"isc-dhcp-no-builddir.patch",
"isc-dhcp-no-werror.patch"]},
{"src": "fd-NM:NetworkManager",
"config-opts": ["--with-distro=generic",
"--with-dhclient=yes",
"--with-crypto=nss",
"--with-docs=no",
"--enable-more-warnings=yes"],
"patches": ["NetworkManager-config.patch"]},
{"src": "fd:polkit",
"patches": ["PolicyKit-libtool.patch"],
"config-opts": ["--disable-man-pages"]},
{"src": "fd:ConsoleKit",
"patches": ["ConsoleKit-builddir.patch"]},
{"src": "0pointer: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",
"--disable-strict"],
"patches": ["upower-no-builddir.patch"]},
{"src": "gnome:gnome-doc-utils",
"config-opts": ["--disable-scrollkeeper",
"--disable-documentation"],
"patches": ["gnome-doc-utils-no-docs.patch"]},
{"src": "gnome:gconf",
"config-opts": ["--disable-orbit",
"--disable-gtk",
"--disable-documentation"]},
{"src": "gnome:pango",
"patches": ["pango-querymodules-system.patch"]},
{"src": "gnome:atk"},
{"src": "gnome:gdk-pixbuf"},
{"src": "gnome:gtk+",
"name": "gtk2",
"branch": "gtk-2-24"},
{"src": "gnome:gtk-engines",
"branch": "gtk-engines-2-22"},
{"src": "gnome:gtk+",
"name": "gtk3"},
{"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",
"patches": ["libxklavier-builddir.patch"],
"branch": "v.5.2.1"},
{"src": "gnome:libgnomekbd"},
{"src": "fd-pulse:pulseaudio",
"branch": "v0.9.23",
"config-opts": ["--disable-openssl"],
"patches": ["pulseaudio-autogen.patch"]},
{"src": "0pointer:libcanberra",
"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": "linuxwacom:xf86-input-wacom",
"patches": ["libwacom-autogen.patch"]},
{"src": "gnome:gnome-settings-daemon",
"config-opts": ["--disable-packagekit",
"--disable-cups"]},
{"src": "git:git://github.com/stephenc/tango-icon-naming.git",
"patches": ["tango-icon-naming-python.patch"],
"component": "devel"},
{"src": "gnome:gnome-themes-standard"},
{"src": "gnome:gnome-icon-theme"},
{"src": "gnome:gnome-icon-theme-symbolic"},
{"src": "gnome:gnome-icon-theme-extras"},
{"src": "gnome:gvfs"},
{"src": "gnome:gnome-screensaver"},
{"src": "gnome:gnome-menus"},
{"src": "gnome:libgnome-keyring"},
{"src": "git:git://pkgs.fedoraproject.org/ca-certificates.git",
"branch": "8c27f267a89811f60b0cb442f637a01b2978e2c2",
"patches": ["ca-certs-build.patch"]},
{"src": "gnome:glib-networking"},
{"src": "gnome:libsoup",
"config-args": ["--disable-tls-check"]},
{"src": "gnome:ostree",
"config-opts": ["--disable-documentation",
"--with-soup-gnome"]},
{"src": "fd-gstreamer:gstreamer",
"config-opts": ["--disable-tests",
"--disable-fatal-warnings"]},
{"src": "fd-gstreamer:gst-plugins-base",
"config-opts": ["--with-gtk=3.0",
"--disable-tests",
"--disable-gnome_vfs",
"--disable-fatal-warnings"],
"patches": ["gst-plugins-base-no-builddir.patch"]},
{"src": "fd-gstreamer:gst-plugins-good",
"config-opts": ["--with-gtk=3.0",
"--disable-tests",
"--disable-examples",
"--disable-fatal-warnings"]},
{"src": "git:git://git.webkit.org/WebKit.git",
"branch": "4e276ff268f3f3e97abb97f8e5a8cf6d8d97d2db",
"patches": ["WebKit-autogen.patch"]},
{"src": "gnome:librest"},
{"src": "gnome:gnome-online-accounts",
"config-opts": ["--disable-documentation"]},
{"src": "gnome:gnome-bluetooth",
"config-opts": ["--disable-documentation",
"--disable-scrollkeeper"]},
{"src": "gnome:zenity"},
{"src": "gnome:metacity"},
{"src": "gnome:mutter",
"config-opts": ["--enable-compile-warnings=maximum"]},
{"src": "cgwalters:spidermonkey-tarballs-as-git",
"config-opts": ["--enable-threadsafe",
"--with-system-nspr"]},
{"src": "gnome:gjs"},
{"src": "cgwalters:vala-tarballs-as-git",
"config-opts": ["--disable-build-from-vala",
"--disable-vapigen"],
"rm-configure": true,
"patches": ["vala-tarballs-as-git-autogen.patch",
"vala-tarballs-as-git-bootstrap.patch"]},
{"src": "gnome:vala",
"name": "vala-0.16",
"config-opts": ["--enable-vapigen"],
"patches": ["vala-builddir.patch"]},
{"src": "gnome:libgee",
"branch": "0.6",
"patches": ["gee-builddir.patch"]},
{"src": "fd-telepathy:telepathy-glib",
"branch": "telepathy-glib-0.17.5",
"config-opts": ["--enable-vala-bindings",
"--disable-compiler-warnings"],
"patches": ["telepathy-glib-builddir.patch"]},
{"src": "gnome:libgweather"},
{"src": "cgwalters:liboauth-tarballs-as-git",
"rm-configure": true,
"config-opts": ["--enable-nss"],
"patches": ["liboauth-tarballs-as-git-autogen.patch"]},
{"src": "gnome:libgdata"},
{"src": "cgwalters:libical-tarballs-as-git"},
{"src": "gnome:evolution-data-server",
"patches": ["e-d-s-builddir.patch"],
"config-opts": ["--enable-vala-bindings"]},
{"src": "gnome:folks",
"config-opts": ["--enable-eds-backend",
"--disable-Werror",
"--disable-fatal-warnings"],
"patches": ["folks-builddir.patch",
"folks-config-fatal-warnings.patch"]},
{"src": "gnome:dconf",
"patches": ["dconf-builddir.patch"]},
{"src": "fd-xdg:default-icon-theme",
"patches": ["default-icon-theme-autogen.patch",
"default-icon-theme-no-builddir.patch"]},
{"src": "fd-xdg:shared-mime-info",
"config-opts": ["--disable-default-make-check"]},
{"src": "gnome:cantarell-fonts"},
{"src": "fd:accountsservice",
"patches": ["accountsservice-builddir.patch"]},
{"src": "gnome:gdm",
"config-opts": ["--disable-documentation",
"--disable-split-authentication",
"--with-default-pam-config=linux",
"--with-consolekit"],
"patches": ["gdm-disable-documentation.patch",
"gdm-debug-prints.patch",
"gdm-pam-config.patch"]},
{"src": "fd-telepathy:telepathy-logger",
"branch": "telepathy-logger-0.2.12",
"patches": ["telepathy-logger-autogen.patch"]},
{"src": "gnome:gnome-power-manager"},
{"src": "gnome:gnome-shell",
"config-opts": ["--enable-compile-warnings=maximum"]},
{"src": "gnome:libgtop"},
{"src": "gnome:clutter-gst"},
{"src": "gnome:gnome-control-center",
"config-opts": ["--disable-cups"]},
{"src": "gnome:notification-daemon"},
{"src": "gnome:libwnck"},
{"src": "gnome:gnome-panel",
"config-opts": ["--disable-documentation"]},
{"src": "gnome:vte",
"branch": "vte-0-32"},
{"src": "gnome:gnome-terminal",
"patches": ["gnome-terminal-disable-docs.patch"],
"branch": "gnome-3-4",
"config-opts": ["--disable-documentation"]},
{"src": "git:git://git.kernel.org/pub/scm/utils/dash/dash.git"},
{"src": "cgwalters:dracut",
"branch": "ostree4",
"config-opts": ["--disable-documentation"]},
{"src": "git:git://git.cairographics.org/git/py2cairo",
"patches": ["py2cairo-autogen.patch"]},
{"src": "gnome:pygobject"},
{"src": "gnome:caribou"}
]
}

23
gnomeos/3.4/gnutls-autogen.patch
View File

@ -1,23 +0,0 @@
From 13cb6d93e84dd47f13c6ca4ea1dfed78c6dc1ae1 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 9 Jan 2012 17:36:05 -0500
Subject: [PATCH] autogen.sh: Add developer bootstrap script
See people.gnome.org/~walters/docs/build-api.txt
---
autogen.sh | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
create mode 100755 autogen.sh
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..bc46fd5
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec autoreconf -ifv
+
--
1.7.6.4

20609
gnomeos/3.4/gperf-autotools.patch
View File

File diff suppressed because it is too large Load Diff

26
gnomeos/3.4/gst-plugins-base-no-builddir.patch
View File

@ -1,26 +0,0 @@
From 23b2d7561fbc609ab2a00c2a261a203587fb802b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 17 Jan 2012 17:12:07 -0500
Subject: [PATCH] build: Note 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 0e3b20e..c811a58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,9 @@ AG_GST_INIT
dnl initialize automake
AM_INIT_AUTOMAKE([-Wno-portability 1.10])
+dnl http://people.gnome.org/~walters/docs/build-api.txt
+echo \#buildapi-variable-no-builddir >/dev/null
+
dnl define PACKAGE_VERSION_* variables
AS_VERSION
--
1.7.6.5

56
gnomeos/3.4/gst-plugins-base-warnings.patch
View File

@ -1,56 +0,0 @@
From f2849da4e3f832d6f5a99bc0f1c0952af3fd2f53 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 17 Jan 2012 16:50:46 -0500
Subject: [PATCH] build: Add --disable-fatal-warnings
It's reasonable to build from git, but not want to turn all compiler
warnings into fatal errors. For example, GNOME's jhbuild helps people
get newer versions of software than came from their distribution, but
they may not necessarily want to hack on it.
---
configure.ac | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 13647a4..0e3b20e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,10 @@ AS_VERSION
dnl check if this is a release version
AS_NANO(GST_GIT="no", GST_GIT="yes")
+AC_ARG_ENABLE(fatal-warnings,
+ AS_HELP_STRING([--enable-fatal-warnings],
+ [Turn compiler warnings into fatal errors]),
+ [GST_FATAL_WARNINGS=$enableval], [GST_FATAL_WARNINGS=$GST_GIT])
dnl can autoconf find the source ?
AC_CONFIG_SRCDIR([gst/audiotestsrc/gstaudiotestsrc.c])
@@ -367,21 +371,21 @@ AG_GST_CHECK_GST_DEBUG_DISABLED([NO_WARNINGS="-Wno-unused"], [NO_WARNINGS=""])
dnl define an ERROR_CFLAGS Makefile variable
dnl -Wformat-nonliteral - see ext/pango/gstclockoverlay.c and http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39438
-AG_GST_SET_ERROR_CFLAGS($GST_GIT, [
+AG_GST_SET_ERROR_CFLAGS($GST_FATAL_WARNINGS, [
-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wundef
-Wwrite-strings -Wformat-nonliteral -Wformat-security
-Winit-self -Wmissing-include-dirs -Waddress -Waggregate-return
-Wno-multichar -Wnested-externs $NO_WARNINGS])
dnl define an ERROR_CXXFLAGS Makefile variable
-AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [
+AG_GST_SET_ERROR_CXXFLAGS($GST_FATAL_WARNINGS, [
-Wmissing-declarations -Wredundant-decls -Wundef
-Wwrite-strings -Wformat-nonliteral -Wformat-security
-Winit-self -Wmissing-include-dirs -Waddress -Waggregate-return
-Wno-multichar $NO_WARNINGS])
dnl define correct level for debugging messages
-AG_GST_SET_LEVEL_DEFAULT($GST_GIT)
+AG_GST_SET_LEVEL_DEFAULT($GST_FATAL_WARNINGS)
dnl used in examples
AG_GST_DEFAULT_ELEMENTS
--
1.7.6.5

65
gnomeos/3.4/gst-plugins-good-warnings.patch
View File

@ -1,65 +0,0 @@
From e9212c6cb3e7efd5165ce10264f25a61ca371b0e Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 18 Jan 2012 16:18:41 -0500
Subject: [PATCH] build: Add --disable-fatal-warnings
It's reasonable to build from git, but not want to turn all compiler
warnings into fatal errors. For example, GNOME's jhbuild helps people
get newer versions of software than came from their distribution, but
they may not necessarily want to hack on it.
---
configure.ac | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 681bc37..6b0a677 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,10 @@ AS_VERSION
dnl check if this is a release version
AS_NANO(GST_GIT="no", GST_GIT="yes")
+AC_ARG_ENABLE(fatal-warnings,
+ AS_HELP_STRING([--enable-fatal-warnings],
+ [Turn compiler warnings into fatal errors]),
+ [GST_FATAL_WARNINGS=$enableval], [GST_FATAL_WARNINGS=$GST_GIT])
dnl can autoconf find the source ?
AC_CONFIG_SRCDIR([gst/law/alaw.c])
@@ -298,7 +302,7 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO],
dnl define an ERROR_CFLAGS Makefile variable
dnl -Wundef: too many broken headers
if test "x$HAVE_OSX_VIDEO" != "xyes"; then
- AG_GST_SET_ERROR_CFLAGS($GST_GIT, [
+ AG_GST_SET_ERROR_CFLAGS($GST_FATAL_WARNINGS, [
-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls
-Wwrite-strings -Wold-style-definition -Waggregate-return
-Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar
@@ -307,7 +311,7 @@ else
dnl work-around for us passing GST_CFLAGS to the ObjC-compiler, which
dnl doesn't understand all warning flags that the C compiler knows about
dnl (e.g. -Waddress) or causes problems with some flags (-Waggregate-return)
- AG_GST_SET_ERROR_CFLAGS($GST_GIT, [
+ AG_GST_SET_ERROR_CFLAGS($GST_FATAL_WARNINGS, [
-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls
-Wwrite-strings -Wold-style-definition
-Winit-self -Wmissing-include-dirs -Wno-multichar
@@ -315,13 +319,13 @@ else
fi
dnl define an ERROR_CXXFLAGS Makefile variable
-AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [
+AG_GST_SET_ERROR_CXXFLAGS($GST_FATAL_WARNINGS, [
-Wmissing-declarations -Wredundant-decls
-Wwrite-strings
-Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar ])
dnl define correct level for debugging messages
-AG_GST_SET_LEVEL_DEFAULT($GST_GIT)
+AG_GST_SET_LEVEL_DEFAULT($GST_FATAL_WARNINGS)
dnl used in examples
AG_GST_DEFAULT_ELEMENTS
--
1.7.6.5

44
gnomeos/3.4/gstreamer-warning-errors.patch
View File

@ -1,44 +0,0 @@
From 40ff38e54022d5330499addb8f9c4053bcccf413 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 17 Jan 2012 16:23:33 -0500
Subject: [PATCH] build: Add --disable-fatal-warnings
It's reasonable to build from git, but not want to turn all compiler
warnings into fatal errors. For example, GNOME's jhbuild helps people
get newer versions of software than came from their distribution, but
they may not necessarily want to hack on it.
---
configure.ac | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7a4d052..d02b043 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,10 @@ AS_VERSION
dnl check if this is a release version
AS_NANO(GST_GIT="no", GST_GIT="yes")
+AC_ARG_ENABLE(fatal-warnings,
+ AS_HELP_STRING([--enable-fatal-warnings],
+ [Turn compiler warnings into fatal errors]),
+ [GST_FATAL_WARNINGS=$enableval], [GST_FATAL_WARNINGS=$GST_GIT])
dnl can autoconf find the source ?
AC_CONFIG_SRCDIR([gst/gst.c])
@@ -646,10 +650,10 @@ if test "x${GST_DISABLE_GST_DEBUG}" = "xyes"; then
fi
dnl define an ERROR_CFLAGS Makefile variable
-AG_GST_SET_ERROR_CFLAGS($GST_GIT, [-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wformat-nonliteral -Wformat-security -Wold-style-definition -Winit-self -Wmissing-include-dirs -Waddress -Waggregate-return -Wno-multichar -Wnested-externs $NO_WARNINGS])
+AG_GST_SET_ERROR_CFLAGS($GST_FATAL_WARNINGS, [-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wformat-nonliteral -Wformat-security -Wold-style-definition -Winit-self -Wmissing-include-dirs -Waddress -Waggregate-return -Wno-multichar -Wnested-externs $NO_WARNINGS])
dnl define correct level for debugging messages
-AG_GST_SET_LEVEL_DEFAULT($GST_GIT)
+AG_GST_SET_LEVEL_DEFAULT($GST_FATAL_WARNINGS)
dnl *** finalize CFLAGS, LDFLAGS, LIBS
--
1.7.6.5

128
gnomeos/3.4/hwdata-buildapi.patch
View File

@ -1,128 +0,0 @@
From 9af4741c11d3ce138886dd8707b3e97e1e570edd Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 8 Jan 2012 17:17:40 -0500
Subject: [PATCH] Add a configure script to implement GNOME Build API
See http://people.gnome.org/~walters/docs/build-api.txt
This also required modifying the install rule to honor DESTDIR.
---
Makefile | 22 +++++---------------
configure | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+), 16 deletions(-)
create mode 100755 configure
diff --git a/Makefile b/Makefile
index efb0cc1..e360181 100644
--- a/Makefile
+++ b/Makefile
@@ -3,17 +3,7 @@ VERSION=$(shell awk '/Version:/ { print $$2 }' hwdata.spec)
RELEASE=$(shell rpm -q --specfile --qf "%{release}" hwdata.spec)
SOURCEDIR := $(shell pwd)
-prefix=$(DESTDIR)/usr
-sysconfdir=$(DESTDIR)/etc
-bindir=$(prefix)/bin
-sbindir=$(prefix)/sbin
-datadir=$(prefix)/share
-mandir=$(datadir)/man
-includedir=$(prefix)/include
-libdir=$(prefix)/lib
-
-CC=gcc
-CFLAGS=$(RPM_OPT_FLAGS) -g
+include Makefile.inc
CVSROOT = $(shell cat CVS/Root 2>/dev/null || :)
@@ -26,13 +16,13 @@ FILES = pci.ids upgradelist usb.ids oui.txt pnp.ids
all:
install:
- mkdir -p -m 755 $(datadir)/$(NAME)
+ mkdir -p -m 755 $(DESTDIR)$(datadir)/$(NAME)
for foo in $(FILES) ; do \
- install -m 644 $$foo $(datadir)/$(NAME) ;\
+ install -m 644 $(srcdir)/$$foo $(DESTDIR)$(datadir)/$(NAME) ;\
done
- mkdir -p -m 755 $(datadir)/$(NAME)/videoaliases
- mkdir -p -m 755 $(sysconfdir)/modprobe.d
- install -m 644 blacklist.conf $(sysconfdir)/modprobe.d
+ mkdir -p -m 755 $(DESTDIR)$(datadir)/$(NAME)/videoaliases
+ mkdir -p -m 755 $(DESTDIR)$(sysconfdir)/modprobe.d
+ install -m 644 $(srcdir)/blacklist.conf $(DESTDIR)$(sysconfdir)/modprobe.d
commit:
git commit -a ||:
diff --git a/configure b/configure
new file mode 100755
index 0000000..5f87c77
--- /dev/null
+++ b/configure
@@ -0,0 +1,63 @@
+#!/bin/bash
+# -*- mode: sh -*-
+# Minimal configure script which writes out a Makefile.inc
+# Copyright 2010, 2011 Colin Walters <walters@verbum.org>
+# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
+
+prefix=/usr
+
+# Little helper function for reading args from the commandline.
+# it automatically handles -a b and -a=b variants, and returns 1 if
+# we need to shift $3.
+read_arg() {
+ # $1 = arg name
+ # $2 = arg value
+ # $3 = arg parameter
+ local rematch='^[^=]*=(.*)$'
+ if [[ $2 =~ $rematch ]]; then
+ read "$1" <<< "${BASH_REMATCH[1]}"
+ else
+ read "$1" <<< "$3"
+ # There is no way to shift our callers args, so
+ # return 1 to indicate they should do it instead.
+ return 1
+ fi
+}
+
+while (($# > 0)); do
+ case "${1%%=*}" in
+ --prefix) read_arg prefix "$@" || shift;;
+ --bindir) read_arg bindir "$@" || shift;;
+ --sbindir) read_arg sbindir "$@" || shift;;
+ --libexecdir) read_arg libexecdir "$@" || shift;;
+ --datarootdir) read_arg datarootdir "$@" || shift;;
+ --datadir) read_arg datadir "$@" || shift;;
+ --sysconfdir) read_arg sysconfdir "$@" || shift;;
+ --libdir) read_arg libdir "$@" || shift;;
+ --mandir) read_arg mandir "$@" || shift;;
+ *) echo "Ignoring unknown option '$1'";;
+ esac
+ shift
+done
+
+# Handle srcdir != builddir
+srcdir=$(dirname $0)
+if ! test -f Makefile; then
+ ln -s ${srcdir}/Makefile Makefile
+fi
+
+cat > Makefile.inc.tmp <<EOF
+srcdir = ${srcdir}
+
+prefix ?= ${prefix}
+bindir ?= ${bindir:-${prefix}/bin}
+sbindir ?= ${sbindir:-${prefix}/sbin}
+libexecdir ?= ${libexecdir:-${prefix}/libexec}
+datarootdir ?= ${datarootdir:-${prefix}/share}
+datadir ?= ${datadir:-${datarootdir}}
+sysconfdir ?= ${sysconfdir:-${prefix}/etc}
+libdir ?= ${libdir:-${prefix}/lib}
+mandir ?= ${mandir:-${prefix}/share/man}
+
+EOF
+mv Makefile.inc.tmp Makefile.inc
--
1.7.6.4

27
gnomeos/3.4/hwdata-no-spec-file.patch
View File

@ -1,27 +0,0 @@
From 33040ba93f2b6d0d8a83248ed90b390eddd5b7bf Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 4 Feb 2012 10:18:22 -0500
Subject: [PATCH] build: Don't depend on hwdata.spec for 'make install'
It's really not necessary to parse "hwdata.spec" to tell us our
package name is "hwdata".
The other targets still do depend on the version/release in
hwdata.spec.
---
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index e360181..b995e64 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-NAME=$(shell awk '/Name:/ { print $$2 }' hwdata.spec)
+NAME=hwdata
VERSION=$(shell awk '/Version:/ { print $$2 }' hwdata.spec)
RELEASE=$(shell rpm -q --specfile --qf "%{release}" hwdata.spec)
SOURCEDIR := $(shell pwd)
--
1.7.6.5

22
gnomeos/3.4/isc-dhcp-autogen.patch
View File

@ -1,22 +0,0 @@
From e2289b453abfe6c4878fceb1a187f12d86fd79b7 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 11 Jan 2012 16:51:37 -0500
Subject: [PATCH] autogen.sh: New developer/git bootstrap script
See http://people.gnome.org/~walters/docs/build-api.txt
---
autogen.sh | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
create mode 100755 autogen.sh
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..c187584
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec autoreconf -vfi
--
1.7.6.4

9955
gnomeos/3.4/isc-dhcp-delete-configure.patch
View File

File diff suppressed because it is too large Load Diff

24
gnomeos/3.4/isc-dhcp-no-builddir.patch
View File

@ -1,24 +0,0 @@
From f957e3282cc88fb10fdd3ce556aa68c797a9021a Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 11 Jan 2012 16:48:36 -0500
Subject: [PATCH] build: We don't support srcdir != builddir
---
configure.ac | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index df4bae3..8df75d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,7 @@
AC_INIT([DHCP], [4.2.2], [dhcp-users@isc.org])
+echo \#buildapi-variable-no-builddir >/dev/null
+
# we specify "foreign" to avoid having to have the GNU mandated files,
# like AUTHORS, COPYING, and such
AM_INIT_AUTOMAKE([foreign])
--
1.7.6.4

26
gnomeos/3.4/isc-dhcp-no-werror.patch
View File

@ -1,26 +0,0 @@
From 9d72f599de73d47196106737ad73527b911840fb Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 11 Jan 2012 16:58:04 -0500
Subject: [PATCH] configure: Don't make warnings into errors by default
That only works if you also check the gcc version.
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8df75d9..cf30197 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_DEFUN([AC_DATAROOTDIR_CHECKED])
# user did not specify any flags. Add warnings in this case.
if test "$GCC" = "yes"; then
if test "$CFLAGS" != "$SAVE_CFLAGS"; then
- STD_CWARNINGS="$STD_CWARNINGS -Wall -Werror -fno-strict-aliasing"
+ STD_CWARNINGS="$STD_CWARNINGS -Wall -fno-strict-aliasing"
fi
fi
--
1.7.6.4

27
gnomeos/3.4/iso-codes-autogen.patch
View File

@ -1,27 +0,0 @@
From 7f4b51e6900c65771b335ee3d713523dfebb5a6d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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

81
gnomeos/3.4/iso-codes-builddir.patch
View File

@ -1,81 +0,0 @@
From aa3a12c9d88e97f579f749f9f2f941d344399c7f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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

26
gnomeos/3.4/iso-codes-no-builddir.patch
View File

@ -1,26 +0,0 @@
From 813b8a0e83be08491d2ca6231cfefe976d942107 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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

26
gnomeos/3.4/libatasmart-autogen.patch
View File

@ -1,26 +0,0 @@
From d3a0d8cbbe8f2375f34ee4c28e4279a8130455e3 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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

25
gnomeos/3.4/libcanberra-autogen.patch
View File

@ -1,25 +0,0 @@
From fb255dd0c00baf1666cd0f7bbe36acc4a1185870 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 15 Jan 2012 16:16:50 -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 e784d3a..630cb97 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,4 +22,6 @@
NOCONFIGURE=1 ./bootstrap.sh
-exec ./configure "$@"
+if test -z "$NOCONFIGURE"; then
+ exec ./configure "$@"
+fi
--
1.7.6.4

61
gnomeos/3.4/libcanberra-no-lynx.patch
View File

@ -1,61 +0,0 @@
From eea817d6dc89b1dfcf144c3a247a62da6be97a1c Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 15 Jan 2012 16:35:43 -0500
Subject: [PATCH] build: Fix build with no lynx installed
---
Makefile.am | 8 +++++++-
doc/Makefile.am | 3 ++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index ffa7265..794fe10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,11 @@
# License along with libcanberra. If not, see
# <http://www.gnu.org/licenses/>.
-dist_doc_DATA = README
+dist_doc_DATA =
+
+if USE_LYNX
+dist_doc_DATA += README
+endif
EXTRA_DIST = \
bootstrap.sh \
@@ -29,7 +33,9 @@ EXTRA_DIST = \
SUBDIRS = src gtkdoc doc
MAINTAINERCLEANFILES = README
+if USE_LYNX
noinst_DATA = README
+endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcanberra.pc
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fae9958..cb27f22 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,7 +16,7 @@
# License along with libcanberra. If not, see
# <http://www.gnu.org/licenses/>.
-noinst_DATA = README.html README
+noinst_DATA = README.html
EXTRA_DIST = $(noinst_DATA) style.css README.html.in
MAINTAINERCLEANFILES = README.html
@@ -26,6 +26,7 @@ if USE_LYNX
README: README.html
$(AM_V_GEN)lynx --dump $^ | sed 's,file://localhost/.*/doc/README.html,README,' > $@
+noinst_DATA += README
CLEANFILES += README
endif
--
1.7.6.4

25
gnomeos/3.4/libgee-compile.patch
View File

@ -1,25 +0,0 @@
From 2d4163a099a3c44721125105e0f8f81bfebb7e53 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 19 Jan 2012 18:45:55 -0500
Subject: [PATCH] Make testarraylist compile again
---
tests/testarraylist.vala | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tests/testarraylist.vala b/tests/testarraylist.vala
index b13ec30..42d02a5 100644
--- a/tests/testarraylist.vala
+++ b/tests/testarraylist.vala
@@ -131,7 +131,7 @@ public class ArrayListTests : BidirListTests {
assert (double_list.add (1.5d));
assert (double_list.add (2.0d));
- double[] double_array = double_list.to_array ();
+ double?[] double_array = double_list.to_array ();
index = 0;
foreach (double element in double_list) {
assert (element == double_array[index++]);
--
1.7.6.5

22
gnomeos/3.4/liboauth-tarballs-as-git-autogen.patch
View File

@ -1,22 +0,0 @@
From dad1621472d32ae2bf291b4d09a5423225262fb3 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 19 Jan 2012 11:53:42 -0500
Subject: [PATCH] autogen.sh: Add developer bootstrap script
http://people.gnome.org/~walters/docs/build-api.txt
---
autogen.sh | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
create mode 100755 autogen.sh
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..c187584
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec autoreconf -vfi
--
1.7.6.5

26
gnomeos/3.4/libusb-autogen.patch
View File

@ -1,26 +0,0 @@
From 2fedb360a7b1c8a836ef6aa6cebe818033fb44b3 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 8 Jan 2012 16:50:12 -0500
Subject: [PATCH] autogen.sh: Honor NOCONFIGURE environment variable
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 d5c6a19..0d6a23d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,5 +8,7 @@ aclocal || exit 1
autoheader || exit 1
autoconf || exit 1
automake -a -c || exit 1
-./configure --enable-maintainer-mode --enable-debug-log \
+if test -z "$NOCONFIGURE"; then
+ ./configure --enable-maintainer-mode --enable-debug-log \
--enable-examples-build $*
+fi
--
1.7.6.4

25
gnomeos/3.4/libwacom-autogen.patch
View File

@ -1,25 +0,0 @@
From 6b92186a171988dd4624b302f22c13a2eb837b16 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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

25
gnomeos/3.4/libxklavier-builddir.patch
View File

@ -1,25 +0,0 @@
From 41e2d4eaec24006139d4e64ee0ae6a21c9ea2d74 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 1 May 2012 15:59:51 -0400
Subject: [PATCH] build: Fix srcdir != builddir when introspection is enabled
---
libxklavier/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am
index c53ff6d..5be41b9 100644
--- a/libxklavier/Makefile.am
+++ b/libxklavier/Makefile.am
@@ -94,7 +94,7 @@ introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURC
Xkl-1.0.gir: libxklavier.la
Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0
-Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS)
+Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS)
Xkl_1_0_gir_LIBS = libxklavier.la
Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources)
INTROSPECTION_GIRS += Xkl-1.0.gir
--
1.7.7.6

49
gnomeos/3.4/mesa-minstall-pwd.patch
View File

@ -1,49 +0,0 @@
From 10f7688eaa7e3380960dcb7d53b28af78dffe96b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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

27
gnomeos/3.4/mesa-no-builddir.patch
View File

@ -1,27 +0,0 @@
From ab5da742da64e1d2fbb96878d0450596d71d5656 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 14 Jan 2012 09:16:20 -0500
Subject: [PATCH] build: Note that we don't support srcdir != builddir
---
configure.ac | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index c9e658c..b321324 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,10 @@ AC_CONFIG_AUX_DIR([bin])
AC_CANONICAL_HOST
AM_INIT_AUTOMAKE([foreign])
+dnl http://people.gnome.org/~walters/docs/build-api.txt
+dnl We don't support srcdir != builddir.
+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.7

44
gnomeos/3.4/panel-disable-docs.patch
View File

@ -1,44 +0,0 @@
From fb914c20a21f62ba9a1e1f3c718bf84046bf0fe0 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 26 Jan 2012 18:11:10 -0500
Subject: [PATCH] build: Add --disable-documentation option
Useful for operating system builders who want to avoid cyclic build
dependencies.
---
configure.ac | 5 +++++
help/Makefile.am | 6 +++++-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9b10a70..b5be442 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,11 @@ AC_SUBST(LIB_PANEL_APPLET_LT_VERSION)
GNOME_MAINTAINER_MODE_DEFINES
+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)
+
LT_PREREQ([2.2.6])
LT_INIT([dlopen disable-static])
diff --git a/help/Makefile.am b/help/Makefile.am
index 7d38ddd..688b08e 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,3 +1,7 @@
-SUBDIRS = clock fish
+DIST_SUBDIRS = clock fish
+SUBDIRS =
+if ENABLE_DOCUMENTATION
+SUBDIRS += $(DIST_SUBDIRS)
+endif
-include $(top_srcdir)/git.mk
--
1.7.6.5

95
gnomeos/3.4/panel-srcdir.patch
View File

@ -1,95 +0,0 @@
From 19a3f846f7bb4629d37f97fe244597d82d41f950 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 23 Feb 2012 10:32:37 -0500
Subject: [PATCH] build: Remove extra $(srcdir) reference for resources
When using $< make will automatically add the $(srcdir), and specifying
it twice will break builds.
---
applets/clock/Makefile.am | 4 ++--
applets/fish/Makefile.am | 4 ++--
applets/wncklet/Makefile.am | 4 ++--
gnome-panel/Makefile.am | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 727d9f3..662ed3e 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -164,10 +164,10 @@ ui_FILES = \
clock-menu.xml
clock-resources.c: clock.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies clock.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name clock $(srcdir)/$<
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name clock $<
clock-resources.h: clock.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies clock.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name clock $(srcdir)/$<
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name clock $<
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = clock.schemas.in
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 52914c2..cfdcf71 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -81,10 +81,10 @@ ui_FILES = \
fish-menu.xml
fish-resources.c: fish.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies fish.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fish $(srcdir)/$<
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fish $<
fish-resources.h: fish.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies fish.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fish $(srcdir)/$<
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fish $<
BUILT_SOURCES = \
fish-resources.c \
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index 19ba602..6c19a28 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -81,10 +81,10 @@ ui_FILES = \
wncklet-resources.c: wncklet.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies wncklet.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name wncklet $(srcdir)/$<
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name wncklet $<
wncklet-resources.h: wncklet.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies wncklet.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name wncklet $(srcdir)/$<
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name wncklet $<
BUILT_SOURCES = \
wncklet-resources.c \
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 1664f56..8463563 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -242,18 +242,18 @@ ui_FILES = \
panel-run-dialog.ui
panel-resources.c: panel.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies panel.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $(srcdir)/$<
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $<
panel-resources.h: panel.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies panel.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $(srcdir)/$<
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $<
uitest_FILES = panel-test-applets.ui
panel-test-applets-resources.c: panel-test-applets.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies panel-test-applets.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $(srcdir)/$<
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $<
panel-test-applets-resources.h: panel-test-applets.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies panel-test-applets.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $(srcdir)/$<
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $<
desktopdir = $(datadir)/applications
desktop_in_files = gnome-panel.desktop.in
--
1.7.6.5

149
gnomeos/3.4/pango-querymodules-system.patch
View File

@ -1,149 +0,0 @@
From 54798de50d8dca0f6834ffb9796fe47c5e04f31e Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 15 Jan 2012 09:43:59 -0500
Subject: [PATCH] querymodules: Add --system argument
When run as a system trigger, we really don't want to be consulting
e.g. /root/.pangorc. Also, the OSTree build system can run as
non-root, but we don't in this case want to look at /home/user since
the user may not even exist in the password database inside the
chroot.
https://bugzilla.gnome.org/show_bug.cgi?id=667960
---
pango/pango-utils.c | 67 +++++++++++++++++++++++++++++++++++++++----------
pango/querymodules.c | 9 ++++++-
2 files changed, 61 insertions(+), 15 deletions(-)
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 44ec353..8177dab 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -532,6 +532,7 @@ pango_scan_int (const char **pos, int *out)
}
static GHashTable *config_hash = NULL;
+static gboolean did_read_user_config = FALSE;
static void
read_config_file (const char *filename, gboolean enoent_error)
@@ -604,23 +605,41 @@ read_config_file (const char *filename, gboolean enoent_error)
}
static void
-read_config (void)
+ensure_config_hash (void)
{
if (!config_hash)
- {
- char *filename;
- const char *home;
- const char *envvar;
-
- config_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
- (GDestroyNotify)g_free,
- (GDestroyNotify)g_free);
- filename = g_build_filename (pango_get_sysconf_subdirectory (),
- "pangorc",
- NULL);
- read_config_file (filename, FALSE);
- g_free (filename);
+ config_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
+ (GDestroyNotify)g_free,
+ (GDestroyNotify)g_free);
+}
+
+static void
+read_config_system (void)
+{
+ char *filename;
+
+ ensure_config_hash ();
+
+ filename = g_build_filename (pango_get_sysconf_subdirectory (),
+ "pangorc",
+ NULL);
+ read_config_file (filename, FALSE);
+ g_free (filename);
+}
+
+static void
+read_config (void)
+{
+ char *filename;
+ const char *home;
+ const char *envvar;
+ read_config_system ();
+
+ if (!did_read_user_config)
+ {
+ did_read_user_config = TRUE;
+
home = g_get_home_dir ();
if (home && *home)
{
@@ -636,6 +655,26 @@ read_config (void)
}
/**
+ * pango_config_key_get_system:
+ * @key: Key to look up, in the form "SECTION/KEY".
+ *
+ * Looks up a key, consulting only the Pango system config database
+ * in $sysconfdir/pango/pangorc.
+ *
+ * Return value: the value, if found, otherwise %NULL. The value is a
+ * newly-allocated string and must be freed with g_free().
+ **/
+char *
+pango_config_key_get_system (const char *key)
+{
+ g_return_val_if_fail (key != NULL, NULL);
+
+ read_config_system ();
+
+ return g_strdup (g_hash_table_lookup (config_hash, key));
+}
+
+/**
* pango_config_key_get:
* @key: Key to look up, in the form "SECTION/KEY".
*
diff --git a/pango/querymodules.c b/pango/querymodules.c
index ef2d09a..a1eec70 100644
--- a/pango/querymodules.c
+++ b/pango/querymodules.c
@@ -44,6 +44,8 @@
#endif
#define SOEXT_LEN ((int) strlen (SOEXT))
+static gboolean system_mode;
+
static gboolean
string_needs_escape (const char *str)
{
@@ -205,6 +207,8 @@ main (int argc, char **argv)
{
{"version", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, &show_version,
"Show version numbers", NULL},
+ {"system", 0, 0, G_OPTION_ARG_NONE, &system_mode,
+ "Do not load configuration from home directory", NULL},
{NULL}
};
@@ -237,7 +241,10 @@ main (int argc, char **argv)
char **dirs;
int i;
- path = pango_config_key_get ("Pango/ModulesPath");
+ if (system_mode)
+ path = pango_config_key_get_system ("Pango/ModulesPath");
+ else
+ path = pango_config_key_get ("Pango/ModulesPath");
if (!path)
path = g_build_filename (pango_get_lib_subdirectory (),
MODULE_VERSION,
--
1.7.6.4

406
gnomeos/3.4/ppp-destdir.patch
View File

@ -1,406 +0,0 @@
From bab87875538aaf096804b598d8759c22f09d362f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 10 Jan 2012 10:33:16 -0500
Subject: [PATCH] build: Use DESTDIR= like automake, not like --prefix
This patch makes the build system comply with the GNOME Build API:
http://people.gnome.org/~walters/docs/build-api.txt
Previously ppp was using DESTDIR in to hold what was given as --prefix
for ./configure, and INSTDIR as DESTDIR. Now INSTDIR is replaced by
DESTDIR, and ./configure --prefix replaces what was formerly DESTDIR.
---
chat/Makefile.linux | 12 ++++++------
configure | 6 +++---
linux/Makefile.top | 22 +++++++++++-----------
pppd/Makefile.linux | 20 ++++++++++----------
pppd/pathnames.h | 2 +-
pppd/plugins/Makefile.linux | 12 ++++++------
pppd/plugins/pppoatm/Makefile.linux | 8 ++++----
pppd/plugins/pppol2tp/Makefile.linux | 8 ++++----
pppd/plugins/radius/Makefile.linux | 18 +++++++++---------
pppd/plugins/rp-pppoe/Makefile.linux | 14 +++++++-------
pppdump/Makefile.linux | 12 ++++++------
pppstats/Makefile.linux | 12 ++++++------
12 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/chat/Makefile.linux b/chat/Makefile.linux
index 1065ac5..5104908 100644
--- a/chat/Makefile.linux
+++ b/chat/Makefile.linux
@@ -1,8 +1,8 @@
# $Id: Makefile.linux,v 1.15 2006/06/04 05:07:46 paulus Exp $
-DESTDIR = $(INSTROOT)@DESTDIR@
-BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/share/man/man8
+PREFIX = @PREFIX@
+BINDIR = $(PREFIX)/sbin
+MANDIR = $(PREFIX)/share/man/man8
CDEF1= -DTERMIOS # Use the termios structure
CDEF2= -DSIGTYPE=void # Standard definition
@@ -24,9 +24,9 @@ chat.o: chat.c
$(CC) -c $(CFLAGS) -o chat.o chat.c
install: chat
- mkdir -p $(BINDIR) $(MANDIR)
- $(INSTALL) -s -c chat $(BINDIR)
- $(INSTALL) -c -m 644 chat.8 $(MANDIR)
+ mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)
+ $(INSTALL) -s -c chat $(DESTDIR)$(BINDIR)
+ $(INSTALL) -c -m 644 chat.8 $(DESTDIR)$(MANDIR)
clean:
rm -f chat.o chat *~
diff --git a/configure b/configure
index 37a6643..ef7b852 100755
--- a/configure
+++ b/configure
@@ -5,7 +5,7 @@
echo \#buildapi-variable-no-builddir >/dev/null
# Where to install stuff by default
-DESTDIR=/usr/local
+PREFIX=/usr/local
SYSCONF=/etc
# if [ -d /NextApps ]; then
@@ -179,7 +179,7 @@ while [ $# -gt 0 ]; do
;;
esac
case $arg in
- --prefix) DESTDIR=$val ;;
+ --prefix) PREFIX=$val ;;
--sysconfdir) SYSCONF=$val ;;
esac
done
@@ -188,7 +188,7 @@ mkmkf() {
rm -f $2
if [ -f $1 ]; then
echo " $2 <= $1"
- sed -e "s,@DESTDIR@,$DESTDIR,g" -e "s,@SYSCONF@,$SYSCONF,g" $1 >$2
+ sed -e "s,@PREFIX@,$PREFIX,g" -e "s,@SYSCONF@,$SYSCONF,g" $1 >$2
fi
}
diff --git a/linux/Makefile.top b/linux/Makefile.top
index f63d45e..d64426a 100644
--- a/linux/Makefile.top
+++ b/linux/Makefile.top
@@ -1,10 +1,10 @@
# PPP top-level Makefile for Linux.
-DESTDIR = $(INSTROOT)@DESTDIR@
-BINDIR = $(DESTDIR)/sbin
-INCDIR = $(DESTDIR)/include
-MANDIR = $(DESTDIR)/share/man
-ETCDIR = $(INSTROOT)@SYSCONF@/ppp
+PREFIX = @PREFIX@
+BINDIR = $(PREFIX)/sbin
+INCDIR = $(PREFIX)/include
+MANDIR = $(PREFIX)/share/man
+ETCDIR = @SYSCONF@/ppp
# uid 0 = root
INSTALL= install
@@ -32,18 +32,18 @@ install-devel:
cd pppd; $(MAKE) $(MFLAGS) install-devel
$(ETCDIR)/options:
- $(INSTALL) -c -m 644 etc.ppp/options $@
+ $(INSTALL) -c -m 644 etc.ppp/options $(DESTDIR)$@
$(ETCDIR)/pap-secrets:
- $(INSTALL) -c -m 600 etc.ppp/pap-secrets $@
+ $(INSTALL) -c -m 600 etc.ppp/pap-secrets $(DESTDIR)$@
$(ETCDIR)/chap-secrets:
- $(INSTALL) -c -m 600 etc.ppp/chap-secrets $@
+ $(INSTALL) -c -m 600 etc.ppp/chap-secrets $(DESTDIR)$@
$(BINDIR):
- $(INSTALL) -d -m 755 $@
+ $(INSTALL) -d -m 755 $(DESTDIR)$@
$(MANDIR)/man8:
- $(INSTALL) -d -m 755 $@
+ $(INSTALL) -d -m 755 $(DESTDIR)$@
$(ETCDIR):
- $(INSTALL) -d -m 755 $@
+ $(INSTALL) -d -m 755 $(DESTDIR)$@
clean:
rm -f `find . -name '*.[oas]' -print`
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 060db6a..661a343 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -4,10 +4,10 @@
#
# Default installation locations
-DESTDIR = $(INSTROOT)@DESTDIR@
-BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/share/man/man8
-INCDIR = $(DESTDIR)/include
+PREFIX = @PREFIX@
+BINDIR = $(PREFIX)/sbin
+MANDIR = $(PREFIX)/share/man/man8
+INCDIR = $(PREFIX)/include
TARGETS = pppd
@@ -79,7 +79,7 @@ INCLUDE_DIRS= -I../include
COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
-CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
+CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DPREFIX="@PREFIX@"'
ifdef CHAPMS
CFLAGS += -DCHAPMS=1
@@ -198,12 +198,12 @@ INSTALL= install
all: $(TARGETS)
install: pppd
- mkdir -p $(BINDIR) $(MANDIR)
+ mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)
$(EXTRAINSTALL)
- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
+ $(INSTALL) -s -c -m 555 pppd $(DESTDIR)$(BINDIR)/pppd
if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
chmod o-rx,u+s $(BINDIR)/pppd; fi
- $(INSTALL) -c -m 444 pppd.8 $(MANDIR)
+ $(INSTALL) -c -m 444 pppd.8 $(DESTDIR)$(MANDIR)
pppd: $(PPPDOBJS)
$(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
@@ -212,8 +212,8 @@ srp-entry: srp-entry.c
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
install-devel:
- mkdir -p $(INCDIR)/pppd
- $(INSTALL) -c -m 644 $(HEADERS) $(INCDIR)/pppd
+ mkdir -p $(DESTDIR)$(INCDIR)/pppd
+ $(INSTALL) -c -m 644 $(HEADERS) $(DESTDIR)$(INCDIR)/pppd
clean:
rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *~ #* core
diff --git a/pppd/pathnames.h b/pppd/pathnames.h
index a33f046..abb8d76 100644
--- a/pppd/pathnames.h
+++ b/pppd/pathnames.h
@@ -57,7 +57,7 @@
#ifdef PLUGIN
#ifdef __STDC__
-#define _PATH_PLUGIN DESTDIR "/lib/pppd/" VERSION
+#define _PATH_PLUGIN PREFIX "/lib/pppd/" VERSION
#else /* __STDC__ */
#define _PATH_PLUGIN "/usr/lib/pppd"
#endif /* __STDC__ */
diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
index 0a7ec7b..b806e2b 100644
--- a/pppd/plugins/Makefile.linux
+++ b/pppd/plugins/Makefile.linux
@@ -4,10 +4,10 @@ CFLAGS = $(COPTS) -I.. -I../../include -fPIC
LDFLAGS = -shared
INSTALL = install
-DESTDIR = $(INSTROOT)@DESTDIR@
-BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/share/man/man8
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+PREFIX = @PREFIX@
+BINDIR = $(PREFIX)/sbin
+MANDIR = $(PREFIX)/share/man/man8
+LIBDIR = $(PREFIX)/lib/pppd/$(VERSION)
SUBDIRS := rp-pppoe pppoatm pppol2tp
# Uncomment the next line to include the radius authentication plugin
@@ -28,8 +28,8 @@ all: $(PLUGINS)
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
install: $(PLUGINS)
- $(INSTALL) -d $(LIBDIR)
- $(INSTALL) $? $(LIBDIR)
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)
+ $(INSTALL) $? $(DESTDIR)$(LIBDIR)
for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install; done
clean:
diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
index 20f62e6..1cb91dd 100644
--- a/pppd/plugins/pppoatm/Makefile.linux
+++ b/pppd/plugins/pppoatm/Makefile.linux
@@ -6,8 +6,8 @@ INSTALL = install
#***********************************************************************
-DESTDIR = $(INSTROOT)@DESTDIR@
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+PREFIX = @PREFIX@
+LIBDIR = $(PREFIX)/lib/pppd/$(VERSION)
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
@@ -36,8 +36,8 @@ $(PLUGIN): $(PLUGIN_OBJS)
$(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
install: all
- $(INSTALL) -d -m 755 $(LIBDIR)
- $(INSTALL) -c -m 4550 $(PLUGIN) $(LIBDIR)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -c -m 4550 $(DESTDIR)$(PLUGIN) $(DESTDIR)$(LIBDIR)
clean:
rm -f *.o *.so
diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
index ea3538e..664dcfa 100644
--- a/pppd/plugins/pppol2tp/Makefile.linux
+++ b/pppd/plugins/pppol2tp/Makefile.linux
@@ -6,8 +6,8 @@ INSTALL = install
#***********************************************************************
-DESTDIR = @DESTDIR@
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+PREFIX = @PREFIX@
+LIBDIR = $(PREFIX)/lib/pppd/$(VERSION)
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
@@ -19,8 +19,8 @@ all: $(PLUGINS)
$(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
install: all
- $(INSTALL) -d -m 755 $(LIBDIR)
- $(INSTALL) -c -m 755 $(PLUGINS) $(LIBDIR)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -c -m 755 $(PLUGINS) $(DESTDIR)$(LIBDIR)
clean:
rm -f *.o *.so
diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
index 24ed3e5..a3dfd31 100644
--- a/pppd/plugins/radius/Makefile.linux
+++ b/pppd/plugins/radius/Makefile.linux
@@ -3,9 +3,9 @@
# Copyright 2002 Roaring Penguin Software Inc.
#
-DESTDIR = $(INSTROOT)@DESTDIR@
-MANDIR = $(DESTDIR)/share/man/man8
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+PREFIX = @PREFIX@
+MANDIR = $(PREFIX)/share/man/man8
+LIBDIR = $(PREFIX)/lib/pppd/$(VERSION)
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
@@ -35,12 +35,12 @@ endif
all: $(PLUGIN)
install: all
- $(INSTALL) -d -m 755 $(LIBDIR)
- $(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
- $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
- $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
- $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
- $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -s -c -m 755 radius.so $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -s -c -m 755 radattr.so $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -s -c -m 755 radrealms.so $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -c -m 444 pppd-radius.8 $(DESTDIR)$(MANDIR)
+ $(INSTALL) -c -m 444 pppd-radattr.8 $(DESTDIR)$(MANDIR)
radius.so: radius.o libradiusclient.a
$(CC) -o radius.so -shared radius.o libradiusclient.a
diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
index 5d7a271..f805d2d 100644
--- a/pppd/plugins/rp-pppoe/Makefile.linux
+++ b/pppd/plugins/rp-pppoe/Makefile.linux
@@ -14,9 +14,9 @@
# $Id: Makefile.linux,v 1.8 2008/06/09 08:34:23 paulus Exp $
#***********************************************************************
-DESTDIR = $(INSTROOT)@DESTDIR@
-BINDIR = $(DESTDIR)/sbin
-LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
+PREFIX = @PREFIX@
+BINDIR = $(PREFIX)/sbin
+LIBDIR = $(PREFIX)/lib/pppd/$(PPPDVERSION)
PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
@@ -42,10 +42,10 @@ rp-pppoe.so: plugin.o discovery.o if.o common.o
$(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
install: all
- $(INSTALL) -d -m 755 $(LIBDIR)
- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
- $(INSTALL) -d -m 755 $(BINDIR)
- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -s -c -m 4550 rp-pppoe.so $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
+ $(INSTALL) -s -c -m 555 pppoe-discovery $(DESTDIR)$(BINDIR)
clean:
rm -f *.o *.so pppoe-discovery
diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
index ac028f6..426653d 100644
--- a/pppdump/Makefile.linux
+++ b/pppdump/Makefile.linux
@@ -1,6 +1,6 @@
-DESTDIR = $(INSTROOT)@DESTDIR@
-BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/share/man/man8
+PREFIX = @PREFIX@
+BINDIR = $(PREFIX)/sbin
+MANDIR = $(PREFIX)/share/man/man8
CFLAGS= -O -I../include/net
OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
@@ -16,6 +16,6 @@ clean:
rm -f pppdump $(OBJS) *~
install:
- mkdir -p $(BINDIR) $(MANDIR)
- $(INSTALL) -s -c pppdump $(BINDIR)
- $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
+ mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)
+ $(INSTALL) -s -c pppdump $(DESTDIR)$(BINDIR)
+ $(INSTALL) -c -m 444 pppdump.8 $(DESTDIR)$(MANDIR)
diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux
index cca6f0f..eca014d 100644
--- a/pppstats/Makefile.linux
+++ b/pppstats/Makefile.linux
@@ -2,9 +2,9 @@
# pppstats makefile
# $Id: Makefile.linux,v 1.9 2006/06/04 05:07:46 paulus Exp $
#
-DESTDIR = $(INSTROOT)@DESTDIR@
-BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/share/man/man8
+PREFIX = @PREFIX@
+BINDIR = $(PREFIX)/sbin
+MANDIR = $(PREFIX)/share/man/man8
PPPSTATSRCS = pppstats.c
PPPSTATOBJS = pppstats.o
@@ -21,9 +21,9 @@ CFLAGS = $(COPTS) $(COMPILE_FLAGS)
all: pppstats
install: pppstats
- -mkdir -p $(MANDIR)
- $(INSTALL) -s -c pppstats $(BINDIR)
- $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
+ -mkdir -p $(DESTDIR)$(MANDIR)
+ $(INSTALL) -s -c pppstats $(DESTDIR)$(BINDIR)
+ $(INSTALL) -c -m 444 pppstats.8 $(DESTDIR)$(MANDIR)
pppstats: $(PPPSTATSRCS)
$(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)
--
1.7.6.4

27
gnomeos/3.4/ppp-srcdir-builddir.patch
View File

@ -1,27 +0,0 @@
From 6bcfe378302a4a798c1201904e43411db3c122b0 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 10 Jan 2012 10:02:17 -0500
Subject: [PATCH] build: Flag this module as not supporting srcdir != builddir
See http://people.gnome.org/~walters/docs/build-api.txt
---
configure | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/configure b/configure
index 56816b8..37a6643 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,9 @@
#!/bin/sh
# $Id: configure,v 1.38 2008/06/15 07:08:49 paulus Exp $
+# http://people.gnome.org/~walters/docs/build-api.txt
+echo \#buildapi-variable-no-builddir >/dev/null
+
# Where to install stuff by default
DESTDIR=/usr/local
SYSCONF=/etc
--
1.7.6.4

25
gnomeos/3.4/pulseaudio-autogen.patch
View File

@ -1,25 +0,0 @@
From 2be8c8bd092a0ee0f0354547f250c2ffd1edcae2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 15 Jan 2012 15:14: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 4051a22..2fff570 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,4 +20,6 @@
NOCONFIGURE=1 ./bootstrap.sh
-exec ./configure "$@"
+if test -z "$NOCONFIGURE"; then
+ exec ./configure "$@"
+fi
--
1.7.6.4

25
gnomeos/3.4/py2cairo-autogen.patch
View File

@ -1,25 +0,0 @@
From f15f500f6adfcff4f673210da8146b83d6b189d5 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 9 Feb 2012 15:58:12 -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 4e6d3d5..d3d1f3f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -193,4 +193,6 @@ cd $ORIGDIR || exit 1
# don't use 'do_cmd' since it prevents
# './autogen.sh --prefix=/usr CFLAGS="$CFLAGS -Werror"' from working
#do_cmd $srcdir/configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
-$srcdir/configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
+if test -z "$NOCONFIGURE"; then
+ $srcdir/configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
+fi
--
1.7.6.5

25
gnomeos/3.4/shared-mime-info-autogen.patch
View File

@ -1,25 +0,0 @@
From 2e486bb8fdfa88801da07357b3d588e1115a0e50 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 23 Jan 2012 21:54:43 -0500
Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1
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 1288bfe..1d1ddb9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -53,4 +53,6 @@ do_cmd autoconf
cd $ORIGDIR || exit $?
-do_cmd $srcdir/configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
+if test -z "$NOCONFIGURE"; then
+ do_cmd $srcdir/configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
+fi
--
1.7.6.5

53
gnomeos/3.4/shared-mime-info-check.patch
View File

@ -1,53 +0,0 @@
From 9aee5e5db7bbc3ff36e73afeb4a8595981810414 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 24 Jan 2012 10:52:00 -0500
Subject: [PATCH] Allow builders to not run make check by default
Doing so breaks cross compilation, and is just plain different from
pretty much every other module out there in the GNOME dependency stack.
Furthermore, the environment needed for tests is not necessarily the
same as that needed to just do a build.
---
Makefile.am | 7 ++++++-
configure.in | 6 ++++++
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 9c2c36d..bbde408 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,7 +68,12 @@ uninstall-hook:
rm -f "$(DESTDIR)$(datadir)/mime/types"
rm -f "$(DESTDIR)$(datadir)/mime/version"
-all: check create-pot
+defaultmakedeps=create-pot
+if ENABLE_DEFAULT_MAKE_CHECK
+defaultmakedeps += check
+endif
+
+all: $(defaultmakedeps)
create-pot:
$(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
diff --git a/configure.in b/configure.in
index 0940625..2d639e6 100644
--- a/configure.in
+++ b/configure.in
@@ -42,6 +42,12 @@ if test "x$GCC" = "xyes"; then
fi
]
+AC_ARG_ENABLE(default-make-check,
+ AC_HELP_STRING([--disable-default-make-check],
+ [run make check by default [default=yes]]),,
+ enable_default_make_check=yes)
+AM_CONDITIONAL(ENABLE_DEFAULT_MAKE_CHECK, test x$enable_default_make_check = xyes)
+
AC_ARG_ENABLE(update-mimedb,
AC_HELP_STRING([--disable-update-mimedb],
[disable the update-mime-database after install [default=no]]),,
--
1.7.6.5

31
gnomeos/3.4/shared-mime-info-parallel.patch
View File

@ -1,31 +0,0 @@
From b067134a866f902b685539add5976f807252d93f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 23 Jan 2012 22:13:15 -0500
Subject: [PATCH] build: Don't make all target depend on check
This breaks parallel make, because the 'check' target depends on the
update-mime-database binary, but that's also listed in bin_PROGRAMS,
and automake's generated rules have $(EXEEXT) on them, so what happens
is make uses the implicit rule.
And really, make check should just be a separate target.
---
Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 9c2c36d..0c96439 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,7 +68,7 @@ uninstall-hook:
rm -f "$(DESTDIR)$(datadir)/mime/types"
rm -f "$(DESTDIR)$(datadir)/mime/version"
-all: check create-pot
+all: create-pot
create-pot:
$(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
--
1.7.6.5

28
gnomeos/3.4/startup-notification-autogen.patch
View File

@ -1,28 +0,0 @@
From 7e326e637e85af9bf9ea10e469fc88946b2b0d4e Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 20 Jan 2012 21:11:37 -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 7c64c34..5d0f2f9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -64,7 +64,9 @@ autoconf || echo "autoconf failed - version 2.5x is probably required"
cd $ORIGDIR
-$srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$NOCONFIGURE"; then
+ $srcdir/configure --enable-maintainer-mode "$@"
+fi
echo
echo "Now type 'make' to compile $PROJECT."
--
1.7.6.5

147
gnomeos/3.4/tango-icon-naming-python.patch
View File

@ -1,147 +0,0 @@
From 633845ace0e94432af319553328c851485218f98 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 23 Jan 2012 21:33:52 -0500
Subject: [PATCH] Port to Python
Most of the newer GNOME developer utilities are Python, not Perl;
also, nothing else depends on Perl XML::Simple, and the fewer modules
in the OS, the better.
---
Makefile.am | 9 +++---
configure.ac | 16 +----------
icon-name-mapping.py.in | 63 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 69 insertions(+), 19 deletions(-)
create mode 100644 icon-name-mapping.py.in
diff --git a/Makefile.am b/Makefile.am
index baa1c42..d6b051a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,9 @@
libexec_SCRIPTS = icon-name-mapping
-%: %.pl.in
- sed -e "s#\@PERL\@#$(PERL)#g" \
- -e "s#\@DATADIR\@#$(pkgdatadir)#g" \
- < $< > $@
+%: %.py.in
+ sed -e "s#\@DATADIR\@#$(pkgdatadir)#g" \
+ < $< > $@.tmp && mv $@.tmp $@
pkgconfig_in_files = \
icon-naming-utils.pc.in
@@ -17,7 +16,7 @@ dtd_DATA = legacy-icon-mapping.dtd
pkgdata_DATA = legacy-icon-mapping.xml
EXTRA_DIST = \
- icon-name-mapping.pl.in \
+ icon-name-mapping.py.in \
$(pkgconfig_in_files) \
$(dtd_DATA) \
$(pkgdata_DATA) \
diff --git a/configure.ac b/configure.ac
index b11f8cf..cfc40dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,26 +2,14 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
AC_INIT([icon-naming-utils], [0.8.90])
-AC_CONFIG_SRCDIR(icon-name-mapping.pl.in)
+AC_CONFIG_SRCDIR(icon-name-mapping.py.in)
AC_COPYRIGHT([Copyright 2005-2007 Rodney Dawes])
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
-AC_PATH_PROG(PERL, perl)
-if test -z "$PERL"; then
- AC_MSG_ERROR([perl not found])
-fi
-if test -z "`$PERL -v | fgrep 'v5.' 2> /dev/null`" -a -z "`$PERL -v | fgrep 'version 5.' 2> /dev/null`"; then
- AC_MSG_ERROR([perl 5.x required for icon-naming-utils])
-fi
-AC_MSG_CHECKING([for XML::Simple])
-if `$PERL -e "require XML::Simple" 2>/dev/null`; then
- AC_MSG_RESULT([ok])
-else
- AC_MSG_ERROR([XML::Simple perl module is required for icon-naming-utils])
-fi
+AM_PATH_PYTHON([2.7])
AC_CONFIG_FILES([
Makefile
diff --git a/icon-name-mapping.py.in b/icon-name-mapping.py.in
new file mode 100644
index 0000000..5189b9b
--- /dev/null
+++ b/icon-name-mapping.py.in
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+
+# Copyright 2012 Colin Walters <walters@verbum.org>
+#
+# Based on icon-name-mapping.pl:
+#
+#############################################################################
+## Copyright (C) 2005-2007 Novell, Inc.
+## Copyright (C) 2005-2007 Rodney Dawes
+##
+## Authors: Rodney Dawes <dobey.pwns@gmail.com>
+##
+
+import os
+import sys
+import argparse
+
+try:
+ import xml.etree.ElementTree as ET
+except ImportError:
+ import elementtree.ElementTree as ET
+
+pkgdatadir = "@DATADIR@"
+
+parser = argparse.ArgumentParser()
+parser.add_argument('-c', '--context', required=True)
+
+args = parser.parse_args(sys.argv[1:])
+
+filename = os.path.join(pkgdatadir, "legacy-icon-mapping.xml")
+mapping = ET.parse(open(filename))
+
+print "Setting up icon mapping for: %s" % (args.context, )
+
+os.chdir(args.context)
+
+def make_icon_links(icon_node, suffix):
+ icon_name = icon_node['name']
+ for node in icon_node:
+ if node.tag != 'link':
+ continue
+ link = node
+ link_target = link.text.strip()
+ if not os.path.lexists(link_target):
+ os.symlink(icon_name + suffix, link_target)
+
+for node in mapping.getroot():
+ if node.tag != 'context':
+ continue
+ context = node
+ dirname = context.attrib['dir']
+ for node in context:
+ if node.tag != 'icon':
+ continue
+ icon = node
+ icon_name = icon.attrib['name']
+ if os.path.isfile(icon_name + '.png'):
+ make_icon_links(icon, '.png')
+ elif os.path.isfile(icon_name + '.svg'):
+ make_icon_links(icon, '.svg')
+
+ if os.path.isfile(icon_name + '.icon'):
+ make_icon_links(icon, '.icon')
--
1.7.6.5

22
gnomeos/3.4/telepathy-glib-0.16.patch
View File

@ -1,22 +0,0 @@
From fa0949cfb146f4d412e035923340ea4265dac4db Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 20 Jan 2012 13:11:31 -0500
Subject: [PATCH] Install telepathy-glib.vapi to vala-0.16 directory
---
vala/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/vala/Makefile.am b/vala/Makefile.am
index faefefa..2d6dbb7 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -1,4 +1,4 @@
-vapidir = $(datarootdir)/vala/vapi
+vapidir = $(datarootdir)/vala-0.16/vapi
vapi_DATA = \
telepathy-glib.vapi \
$(NULL)
--
1.7.6.5

26
gnomeos/3.4/telepathy-glib-builddir.patch
View File

@ -1,26 +0,0 @@
From c80f8fbda32f8bd3d2535686775493de8d0f60d1 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 20 Jan 2012 15:59:01 -0500
Subject: [PATCH] configure: Note 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 a29efdd..69cb0b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,9 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 -Wno-portability])
AM_CONFIG_HEADER(config.h)
+dnl vapigen fails to locate .metadata file when srcdir != builddir
+echo \#buildapi-variable-no-builddir >/dev/null
+
AM_SILENT_RULES
dnl check for tools
--
1.7.6.5

35
gnomeos/3.4/telepathy-logger-autogen.patch
View File

@ -1,35 +0,0 @@
From d14132c39fc1fe14d2ba50824f1ffb7f279af0db Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 20 Jan 2012 23:26:32 -0500
Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1
See http://people.gnome.org/~walters/docs/build-api.txt
---
autogen.sh | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 58ee191..f1301f1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,13 +23,13 @@ run_configure=true
for arg in $*; do
case $arg in
--no-configure)
- run_configure=false
- ;;
+ run_configure=false
+ ;;
*)
- ;;
+ ;;
esac
done
-if test $run_configure = true; then
+if test -z "$NOCONFIGURE" && test $run_configure = true; then
./configure "$@"
fi
--
1.7.6.5

94
gnomeos/3.4/texinfo-disable-man.patch
View File

@ -1,94 +0,0 @@
Upstream-Status: Rejected
From: karl@freefriends.org (Karl Berry)
To: walters@verbum.org
Cc: bug-texinfo@gnu.org
Subject: Re: [PATCH] build: Add --disable-man-pages option
In-Reply-To: <1326151868.18105.29.camel@lenny>
X-Truedomain-Domain: freefriends.org
X-Truedomain-SPF: No Record
X-Truedomain-DKIM: No Signature
X-Truedomain-ID: 879931C0FCAE2AC999DC38484F93ACA5
X-Truedomain: Neutral
Mime-Version: 1.0
Sorry, I'm not inclined to complicate my configure script with an option
that I can't plausibly document in order to placate your build system.
Presumably you can install the patch as part of your build.
From 2fc37f3c696d7ffa9a3dbf6c6f5e1b10f81753a8 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 9 Jan 2012 13:13:57 -0500
Subject: [PATCH] build: Add --disable-man-pages option
There's a circular build dependency between texinfo and help2man
now. Allow operating system builders to manually break the cycle
by disabling man page generation in texinfo.
---
configure.ac | 8 +++++++-
doc/Makefile.am | 11 ++++++++++-
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3ca8b64..31f0c7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,13 @@ gl_INIT
# Since we make a helper library.
AC_PROG_RANLIB
-AM_MISSING_PROG(HELP2MAN, help2man)
+AC_ARG_ENABLE([man-pages],
+ [AS_HELP_STRING([--enable-man-pages],
+ [Build man pages with help2man])],, enable_man_pages=yes)
+AM_CONDITIONAL(ENABLE_MAN_PAGES, test x$enable_man_pages = xyes)
+if test x$enable_man_pages = xyes; then
+ AM_MISSING_PROG(HELP2MAN, help2man)
+fi
AC_PROG_INSTALL
AC_PROG_MAKE_SET
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 54c490e..7ce2cee 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -14,8 +14,10 @@
info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
DISTCLEANFILES = texinfo texinfo-* info*.info*
+if ENABLE_MAN_PAGES
man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 \
info.5 texinfo.5
+endif
# Use the programs built in our distribution, taking account of possible
# cross-compiling.
@@ -36,9 +38,14 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \
# Include our texinfo.tex, not Automake's.
EXTRA_DIST = epsf.tex texinfo.tex \
fdl.texi \
- $(man_MANS) $(TXI_XLATE)
+ $(TXI_XLATE)
$(refcard_files)
+if ENABLE_MAN_PAGES
+EXTRA_DIST += $(man_MANS)
+endif
+
+
if INSTALL_WARNINGS
install-data-local:
@echo
@@ -108,7 +115,9 @@ $(srcdir)/texindex.1: $(util_srcdir)/texindex.c $(common_mandeps)
## texi2dvi. ##
## ---------- ##
+if ENABLE_MAN_PAGES
man_MANS += texi2dvi.1 texi2pdf.1 pdftexi2dvi.1
+endif
util_srcdir = $(top_srcdir)/util
# Do not depend on the current user's settings.
--
1.7.6.4

25
gnomeos/3.4/udev-autogen.patch
View File

@ -1,25 +0,0 @@
From e87b015ab1f2ff755bd669891d9c37b7e112b7e2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 8 Jan 2012 15:32:49 -0500
Subject: [PATCH] autogen.sh: Honor NOCONFIGURE envrionment variable
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 b6ffee7..af056a1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,4 +31,6 @@ args="--prefix=/usr \
--with-selinux \
--enable-gtk-doc"
-./configure $args CFLAGS="${CFLAGS} ${MYCFLAGS}" $@
+if test -z "$NOCONFIGURE"; then
+ ./configure $args CFLAGS="${CFLAGS} ${MYCFLAGS}" $@
+fi
--
1.7.6.4

83
gnomeos/3.4/udev-docs.patch
View File

@ -1,83 +0,0 @@
From 1d6d869d498227d6f13b312a6a00ab31de5996a9 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 9 Jan 2012 14:34:24 -0500
Subject: [PATCH] build: Add --disable-documentation configure option
Documentation is the source of many cyclical build loops. Allow
operating system builders to manually cut these cycles initially
by disabling documentation for a first pass.
---
Makefile.am | 10 ++++++++--
configure.ac | 9 ++++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 7a35395..08213ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -191,12 +191,15 @@ udev_udevadm_LDADD = libudev/libudev-private.la
# ------------------------------------------------------------------------------
# udev man pages
# ------------------------------------------------------------------------------
-dist_man_MANS = \
+dist_man_MANS =
+dist_noinst_DATA =
+if ENABLE_DOCUMENTATION
+dist_man_MANS += \
udev/udev.7 \
udev/udevadm.8 \
udev/udevd.8
-dist_noinst_DATA = \
+dist_noinst_DATA += \
udev/udev.html \
udev/udevadm.html \
udev/udevd.html
@@ -205,6 +208,7 @@ EXTRA_DIST += \
udev/udev.xml \
udev/udevadm.xml \
udev/udevd.xml
+endif
udev/%.7 udev/%.8 : udev/%.xml
$(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
@@ -270,7 +274,9 @@ extras_scsi_id_scsi_id_SOURCES =\
extras/scsi_id/scsi_id.h
extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la
libexec_PROGRAMS += extras/scsi_id/scsi_id
+if ENABLE_DOCUMENTATION
dist_man_MANS += extras/scsi_id/scsi_id.8
+endif
EXTRA_DIST += extras/scsi_id/README
# ------------------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index e387fac..3c7b830 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,6 @@ LT_INIT([disable-static])
AC_PROG_AWK
GTK_DOC_CHECK(1.10)
AC_PREFIX_DEFAULT([/usr])
-AC_PATH_PROG([XSLTPROC], [xsltproc])
AC_SEARCH_LIBS([clock_gettime], [rt], [], [AC_MSG_ERROR([POSIX RT library not found])])
@@ -39,6 +38,14 @@ AS_IF([test "x$with_selinux" = "xyes"], [
AC_SUBST([SELINUX_LIBS])
AM_CONDITIONAL(WITH_SELINUX, [test "x$with_selinux" = "xyes"])
+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])
+fi
+
AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug], [enable debug messages @<:@default=disabled@:>@]),
[], [enable_debug=no])
--
1.7.6.4

25
gnomeos/3.4/udev-gudev-libtool.patch
View File

@ -1,25 +0,0 @@
From 124cef85d3a20f30a3411a9f42a8a478c47d3f63 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 27 Jan 2012 17:37:23 -0500
Subject: [PATCH] gudev: Ensure we use libtool to link
Otherwise we won't find the shared library which is hidden in .libs.
---
Makefile.am | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 7a35395..c264398 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -392,6 +392,7 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER)
--library=gudev-1.0 \
--library-path=$(top_builddir)/libudev \
--library-path=$(top_builddir)/extras/gudev \
+ --libtool="$(LIBTOOL)" \
--output $@ \
--pkg=glib-2.0 \
--pkg=gobject-2.0 \
--
1.7.6.5

26
gnomeos/3.4/udisks-autogen-no-gtk-doc.patch
View File

@ -1,26 +0,0 @@
From 66f7851e8864f12409a1b1c22759c74773dde432 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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

59
gnomeos/3.4/udisks-build-without-docs.patch
View File

@ -1,59 +0,0 @@
From da61dedfa523f3e6761ed0da91d8d95c6d4caebd Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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

26
gnomeos/3.4/udisks-no-builddir.patch
View File

@ -1,26 +0,0 @@
From f3c2cc5eab452e5eb091a6687460cad033b82041 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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

26
gnomeos/3.4/upower-no-builddir.patch
View File

@ -1,26 +0,0 @@
From 9b10d2fc4cc815c1ddfa4547142806203045d089 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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

27
gnomeos/3.4/usbutils-autogen.patch
View File

@ -1,27 +0,0 @@
From f93dd8b7955010289b6116604798360fc735a996 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 8 Jan 2012 16:57:39 -0500
Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1 environment variable
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 2e7bfc5..e15a8c2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -35,5 +35,7 @@ args="--prefix=/usr \
--with-selinux \
--enable-gtk-doc"
-export CFLAGS="$CFLAGS $MYCFLAGS"
-./configure $args $@
+if test -z "$NOCONFIGURE"; then
+ export CFLAGS="$CFLAGS $MYCFLAGS"
+ ./configure $args $@
+fi
--
1.7.6.4

27
gnomeos/3.4/vala-0.14-builddir.patch
View File

@ -1,27 +0,0 @@
From b6f9227ed3eba3f3fbbcfc6f7c42de6c6c019a7b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 19 Jan 2012 16:14:05 -0500
Subject: [PATCH] build: Note we don't support srcdir != builddir
Only when built from git.
---
configure.ac | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index e17bb22..b14aa9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,9 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 dist-bzip2])
AM_MAINTAINER_MODE([enable])
+dnl http://people.gnome.org/~walters/docs/build-api.txt
+echo \#buildapi-variable-no-builddir >/dev/null
+
PACKAGE_SUFFIX=-0.14
AC_SUBST(PACKAGE_SUFFIX)
AC_DEFINE_UNQUOTED(PACKAGE_SUFFIX, "$PACKAGE_SUFFIX", [Define to the suffix of this package])
--
1.7.6.5

26
gnomeos/3.4/vala-builddir.patch
View File

@ -1,26 +0,0 @@
From e82f2019905dbcb3402bf821cdc0fc3a305cca4c Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 19 Jan 2012 10:31:06 -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 fe30ce0..2ddd31f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,9 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 dist-bzip2])
AM_MAINTAINER_MODE([enable])
+dnl http://people.gnome.org/~walters/docs/build-api.txt
+echo \#buildapi-variable-no-builddir >/dev/null
+
PACKAGE_SUFFIX=-0.16
AC_SUBST(PACKAGE_SUFFIX)
AC_DEFINE_UNQUOTED(PACKAGE_SUFFIX, "$PACKAGE_SUFFIX", [Define to the suffix of this package])
--
1.7.6.5

21
gnomeos/3.4/vala-tarballs-as-git-autogen.patch
View File

@ -1,21 +0,0 @@
From 0beb1f6637f0abb514cd0606fdf8796d4073afb7 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 19 Jan 2012 08:40:55 -0500
Subject: [PATCH] autogen.sh: Bootstrapping script
---
autogen.sh | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
create mode 100755 autogen.sh
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..c187584
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec autoreconf -vfi
--
1.7.6.5

192
gnomeos/3.4/vala-tarballs-as-git-bootstrap.patch
View File

@ -1,192 +0,0 @@
From 96511d01aec1bf4d7d15cc395c8d1fdd518e8ca7 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 19 Jan 2012 08:39:00 -0500
Subject: [PATCH] Add --disable-build-from-vala configure flag
This is useful for operating system bootstrappers when compiling from
a copy of vala with pregenerated .c files. Traditionally one might
rely on timestamps for this, but honestly that's stupid. Timestamps
just aren't reliable normally, and my build process requires that
everything is in git, which doesn't preserve timestamps.
---
ccode/Makefile.am | 5 ++++-
codegen/Makefile.am | 5 ++++-
compiler/Makefile.am | 5 ++++-
configure.ac | 7 ++++++-
gee/Makefile.am | 13 ++++++++-----
vala/Makefile.am | 5 ++++-
vapigen/Makefile.am | 10 ++++++++--
7 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/ccode/Makefile.am b/ccode/Makefile.am
index c63dd06..0eb0193 100644
--- a/ccode/Makefile.am
+++ b/ccode/Makefile.am
@@ -67,10 +67,13 @@ libvalaccode_la_VALASOURCES = \
$(NULL)
libvalaccode_la_SOURCES = \
- ccode.vala.stamp \
$(libvalaccode_la_VALASOURCES:.vala=.c) \
$(NULL)
+if ENABLE_BUILD_FROM_VALA
+libvalaccode_la_SOURCES += ccode.vala.stamp
+endif
+
ccodeincludedir = $(includedir)/vala@PACKAGE_SUFFIX@
ccodeinclude_HEADERS = \
diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index 2535a88..a6c38cc 100644
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -57,10 +57,13 @@ libvala_la_VALASOURCES = \
$(NULL)
libvala@PACKAGE_SUFFIX@_la_SOURCES = \
- codegen.vala.stamp \
$(libvala_la_VALASOURCES:.vala=.c) \
$(NULL)
+if ENABLE_BUILD_FROM_VALA
+libvala@PACKAGE_SUFFIX@_la_SOURCES += codegen.vala.stamp
+endif
+
codegenincludedir = $(includedir)/vala@PACKAGE_SUFFIX@
codegeninclude_HEADERS = \
diff --git a/compiler/Makefile.am b/compiler/Makefile.am
index d6e7f81..0f56932 100644
--- a/compiler/Makefile.am
+++ b/compiler/Makefile.am
@@ -21,10 +21,13 @@ valac_VALASOURCES = \
$(NULL)
valac_SOURCES = \
- valac.vala.stamp \
$(valac_VALASOURCES:.vala=.c) \
$(NULL)
+if ENABLE_BUILD_FROM_VALA
+valac_SOURCES += valac.vala.stamp
+endif
+
valac.vala.stamp: $(valac_VALASOURCES)
$(VALA_V)$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir $(srcdir)/../gee --pkg gee --vapidir $(srcdir)/../ccode --pkg ccode --vapidir $(srcdir)/../vala --pkg vala --vapidir $(srcdir)/../codegen --pkg codegen --pkg config $^
@touch $@
diff --git a/configure.ac b/configure.ac
index fe30ce0..fcde8d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,12 @@ if test "$YACC" = :; then
AC_MSG_ERROR([bison not found but required])
fi
-AC_PATH_PROG(VALAC, valac, valac)
+AC_ARG_ENABLE(build-from-vala, AS_HELP_STRING([--disable-build-from-vala], [Never invoke valac]), enable_build_from_vala=$enableval, enable_build_from_vala=yes)
+AM_CONDITIONAL(ENABLE_BUILD_FROM_VALA, test x$enable_build_from_vala = xyes)
+
+if test x$enable_build_from_vala = xyes; then
+ AC_PATH_PROG(VALAC, valac, valac)
+fi
AC_SUBST(VALAC)
VALAFLAGS="$VALAFLAGS --disable-version-header"
diff --git a/gee/Makefile.am b/gee/Makefile.am
index ab31565..ea6f493 100644
--- a/gee/Makefile.am
+++ b/gee/Makefile.am
@@ -4,8 +4,7 @@ AM_CPPFLAGS = \
$(COVERAGE_CFLAGS) \
$(GLIB_CFLAGS) \
$(NULL)
-
-BUILT_SOURCES = gee.vala.stamp
+BUILT_SOURCES =
noinst_LTLIBRARIES = \
libgee.la
@@ -22,12 +21,18 @@ libgee_la_VALASOURCES = \
map.vala \
set.vala \
$(NULL)
+EXTRA_DIST = $(libgee_la_VALASOURCES)
libgee_la_SOURCES = \
- gee.vala.stamp \
$(libgee_la_VALASOURCES:.vala=.c) \
$(NULL)
+if ENABLE_BUILD_FROM_VALA
+BUILT_SOURCES += gee.vala.stamp
+libgee_la_SOURCES += gee.vala.stamp
+EXTRA_DIST += gee.vapi gee.vala.stamp
+endif
+
geeincludedir = $(includedir)/vala@PACKAGE_SUFFIX@
geeinclude_HEADERS = \
@@ -43,8 +48,6 @@ libgee_la_LIBADD = \
$(GLIB_LIBS) \
$(NULL)
-EXTRA_DIST = $(libgee_la_VALASOURCES) gee.vapi gee.vala.stamp
-
MAINTAINERCLEANFILES = \
gee.vapi \
valagee.h \
diff --git a/vala/Makefile.am b/vala/Makefile.am
index 936a2cb..6d6f3e5 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -164,10 +164,13 @@ libvalacore_la_VALASOURCES = \
$(NULL)
libvalacore_la_SOURCES = \
- vala.vala.stamp \
$(libvalacore_la_VALASOURCES:.vala=.c) \
$(NULL)
+if ENABLE_BUILD_FROM_VALA
+libvalacore_la_SOURCES += vala.vala.stamp
+endif
+
valaincludedir = $(includedir)/vala@PACKAGE_SUFFIX@
valainclude_HEADERS = \
diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am
index 2f08351..6122aed 100644
--- a/vapigen/Makefile.am
+++ b/vapigen/Makefile.am
@@ -27,19 +27,25 @@ vapigen_VALASOURCES = \
$(NULL)
vapigen_SOURCES = \
- vapigen.vala.stamp \
$(vapigen_VALASOURCES:.vala=.c) \
$(NULL)
+if ENABLE_BUILD_FROM_VALA
+vapigen_SOURCES += vapigen.vala.stamp
+endif
+
vapicheck_VALASOURCES = \
valavapicheck.vala \
$(NULL)
vapicheck_SOURCES = \
- vapicheck.vala.stamp \
$(vapicheck_VALASOURCES:.vala=.c) \
$(NULL)
+if ENABLE_BUILD_FROM_VALA
+vapicheck_SOURCES += vapicheck.vala.stamp
+endif
+
vapigen.vala.stamp: $(vapigen_VALASOURCES)
$(VALA_V)$(VALAC) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --vapidir $(srcdir)/../gee --pkg gee --vapidir $(srcdir)/../ccode --pkg ccode --vapidir $(srcdir)/../vala --pkg vala --vapidir $(srcdir)/../gobject-introspection --pkg gidl --pkg config $^
@touch $@
--
1.7.6.5

26
gnomeos/3.4/xkbcomp-autogen.patch
View File

@ -1,26 +0,0 @@
From 8d6be7bc9020efa0e8ed1e0f81d3ab1afb152592 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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

25
gnomeos/3.4/xorg-autogen.patch
View File

@ -1,25 +0,0 @@
From c3f75d8999b343131627a7f857e27f05a0f8d4aa Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 4 Jan 2012 17:37:06 -0500
Subject: [PATCH] autogen.sh: Implement GNOME Build API
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

26
gnomeos/3.4/xorg-libXxf86vm-autogen.patch
View File

@ -1,26 +0,0 @@
From ea03f018ad4a9278d27bc84404ff1259b3690eba Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 6 Jan 2012 16:56:26 -0500
Subject: [PATCH] autogen.sh: Honor NOCONFIGURE environment variable
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

146
gnomeos/README-build.md
View File

@ -1,146 +0,0 @@
Overview
--------
The build process is divided into two levels:
1) Yocto
2) ostbuild
Yocto is used as a reliable, well-maintained bootstrapping tool. It
provides the basic filesystem layout as well as binaries for core
build utilities like gcc and bash. This gets us out of circular
dependency problems.
At the end, the Yocto build process generates two tarballs: one for a
base "runtime", and one "devel" with all of the development tools like
gcc. We then import that into an OSTree branch
e.g. "bases/yocto/gnomeos-3.4-i686-devel".
At present, it's still (mostly) possible to put this data on an ext4
filesystem and boot into it.
We also have a Yocto recipe "ostree-native" which generates (as you
might guess) a native binary of ostree. That binary is used to import
into an "archive mode" OSTree repository. You can see it in
$builddir/tmp/deploy/images/repo.
Now that we have an OSTree repository storing a base filesystem, we
can use "ostbuild" which uses "linux-user-chroot" to chroot inside,
run a build on a source tree, and outputs binaries, which we then add
to the build tree for the next module, and so on.
The final result of all of this is that the OSTree repository gains
new commits (which can be downloaded by clients), while still
retaining old build history.
Yocto details
-------------
I have a branch of Yocto here:
https://github.com/cgwalters/poky
It has a collection of patches on top of the "Edison" release of
Yocto, some of which are hacky, others upstreamable. The most
important part though are the modifications to commit the generated
root filesystem into OSTree.
ostbuild details
----------------
The simple goal of ostbuild is that it only takes as input a
"manifest" which is basically just a list of components to build. You
can see this here:
http://git.gnome.org/browse/ostree/tree/gnomeos/3.4/gnomeos-3.4-src.json
A component is a pure metadata file which includes the git repository
URL and branch name, as well as ./configure flags (--enable-foo).
There is no support for building from "tarballs" - I want the ability
to review all of the code that goes in, and to efficiently store
source code updates. It's also just significantly easier from an
implementation perspective, versus having to maintain a version
control abstraction layer.
The result of a build of a component is an OSTree branch like
"artifacts/gnomeos-3.4-i686-devel/libxslt/master". Then, a "compose"
process merges together the individual filesystem trees into the final
branches (e.g. gnomeos-3.4-i686-devel).
Doing local builds
------------------
This is where you want to modify one (or a few) components on top of
what comes from the ostree.gnome.org server, and test the result
locally. I'm working on this.
Doing a full build on your system
---------------------------------
Following this process is equivalent to what we have set up on the
ostree.gnome.org build server. It will generate a completely new
repository.
srcdir=/src
builddir=/src/build
# First, you'll need "http://git.gnome.org/browse/linux-user-chroot/"
# installed as setuid root.
cd $srcdir
git clone gnome:linux-user-chroot
cd linux-user-chroot
NOCONFIGURE=1 ./autogen.sh
./configure
make
sudo make install
sudo chown root:root /usr/local/bin/linux-user-chroot
sudo chmod u+s /usr/local/bin/linux-user-chroot
# We're going to be using Yocto. You probably want to refer to:
# http://www.yoctoproject.org/docs/current/yocto-project-qs/yocto-project-qs.html
# Next, we're grabbing my Poky branch.
git clone git://github.com/cgwalters/poky.git
cd $builddir
# This command enters the Poky environment, creating
# a directory named gnomeos-build.
. $srcdir/poky/oe-init-build-env gnomeos-build
# Now edit conf/bblayers.conf, and add
# /src/poky/meta-gnomeos
# to BBLAYERS.
# Make sure tools-profile and tools-testapps are not in EXTRA_IMAGE_FEATURES
# Also, you should choose useful values for BB_NUMBER_THREADS, PARALLEL_MAKE
bitbake ostree-native
bitbake gnomeos-contents-{runtime,devel}
# This bit is just for shorthand convenience, you can skip it
cd $builddir
ln -s tmp/deploy/images/repo repo
# Now create a file ~/.config/ostbuild.cfg
# example contents:
# [global]
# repo=/src/build/gnomeos-build/build/repo
# mirrordir=/src/build/ostbuild/src
# workdir=/src/build/ostbuild/work
# manifest=/src/ostree/gnomeos/3.4/gnomeos-3.4-src.json
# Now we want to use the "ostbuild" binary that was created
# as part of "bitbake ostree-native". You can do e.g.:
export PATH=$builddir/build/tmp/sysroots/x86_64-linux/usr/bin:$PATH
# This next command will download all of the source code to the
# modules specified in $srcdir/ostree/gnomeos/3.4/manifest.json,
# and create a file $workdir/manifest.json that has the
# exact git commits we want to build.
ostbuild resolve
# This command builds everything
ostbuild build

Some files were not shown because too many files have changed in this diff Show More