diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-10 18:31:24 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-10 18:31:24 +0100 |
commit | 6da31fbd8d6380e9fe05de6a6d499498d2cf770d (patch) | |
tree | b23625c333ee62f1d8181dff46a57b2680bb0f7b /package/polkit/patches | |
parent | 51ef23fb3b2a262ffa4a6b305fd76aaa9a3b1da1 (diff) | |
parent | 62cacb3167cd0eb2d016e6a715ad9b5f1d210b32 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/polkit/patches')
-rw-r--r-- | package/polkit/patches/patch-Makefile_am | 10 | ||||
-rw-r--r-- | package/polkit/patches/patch-actions_Makefile_am | 11 | ||||
-rw-r--r-- | package/polkit/patches/patch-autogen_sh | 63 | ||||
-rw-r--r-- | package/polkit/patches/patch-configure_ac | 54 | ||||
-rw-r--r-- | package/polkit/patches/patch-src_polkit_Makefile_am | 35 | ||||
-rw-r--r-- | package/polkit/patches/patch-src_polkitagent_Makefile_am | 37 |
6 files changed, 210 insertions, 0 deletions
diff --git a/package/polkit/patches/patch-Makefile_am b/package/polkit/patches/patch-Makefile_am new file mode 100644 index 000000000..878409f17 --- /dev/null +++ b/package/polkit/patches/patch-Makefile_am @@ -0,0 +1,10 @@ +--- polkit-0.112.orig/Makefile.am 2013-09-18 18:55:09.000000000 +0200 ++++ polkit-0.112/Makefile.am 2014-01-09 21:28:39.000000000 +0100 +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-SUBDIRS = actions data src docs po test ++SUBDIRS = data src + + NULL = + diff --git a/package/polkit/patches/patch-actions_Makefile_am b/package/polkit/patches/patch-actions_Makefile_am new file mode 100644 index 000000000..ea3d2131a --- /dev/null +++ b/package/polkit/patches/patch-actions_Makefile_am @@ -0,0 +1,11 @@ +--- polkit-0.112.orig/actions/Makefile.am 2013-09-18 18:55:09.000000000 +0200 ++++ polkit-0.112/actions/Makefile.am 2014-01-09 21:14:31.000000000 +0100 +@@ -3,8 +3,6 @@ polkit_actiondir = $(datadir)/polkit-1/a + + dist_polkit_action_DATA = org.freedesktop.policykit.policy + +-@INTLTOOL_POLICY_RULE@ +- + #check: + # $(top_builddir)/tools/polkit-policy-file-validate-1 $(top_srcdir)/policy/$(dist_polkit_action_DATA) + diff --git a/package/polkit/patches/patch-autogen_sh b/package/polkit/patches/patch-autogen_sh new file mode 100644 index 000000000..6c2cf15a2 --- /dev/null +++ b/package/polkit/patches/patch-autogen_sh @@ -0,0 +1,63 @@ +--- polkit-0.112.orig/autogen.sh 2013-09-18 18:55:09.000000000 +0200 ++++ polkit-0.112/autogen.sh 2014-01-09 21:12:29.000000000 +0100 +@@ -34,14 +34,6 @@ touch ChangeLog + } + } + +-(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || { +- echo +- echo "You must have gtk-doc installed to compile $PROJECT." +- echo "Install the appropriate package for your distribution," +- echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" +- DIE=1 +-} +- + (automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have automake installed." +@@ -74,13 +66,6 @@ if test "$DIE" -eq 1; then + exit 1 + fi + +-if test -z "$*"; then +- echo "**Warning**: I am going to run configure with no arguments." +- echo "If you wish to pass any to it, please specify them on the" +- echo $0 " command line." +- echo +-fi +- + case $CC in + xlc ) + am_opt=--include-deps;; +@@ -88,13 +73,10 @@ esac + + aclocalinclude="$ACLOCAL_FLAGS" + +- echo "Running autoreconf on test/mocklibc ..." +- (cd "test/mocklibc"; autoreconf --install) +- + if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then + if test -z "$NO_LIBTOOLIZE" ; then + echo "Running libtoolize..." +- libtoolize --force --copy ++ libtoolize -q --force --copy + fi + fi + echo "Running aclocal $aclocalinclude ..." +@@ -108,16 +90,4 @@ esac + echo "Running autoconf ..." + autoconf + +-intltoolize --copy --force --automake || exit 1 +- + cd "$olddir" +- +-conf_flags="--enable-maintainer-mode --enable-gtk-doc" +- +-if test x$NOCONFIGURE = x; then +- echo "Running $srcdir/configure $conf_flags $@ ..." +- $srcdir/configure $conf_flags "$@" \ +- && echo "Now type make to compile." || exit 1 +-else +- echo "Skipping configure process." +-fi diff --git a/package/polkit/patches/patch-configure_ac b/package/polkit/patches/patch-configure_ac new file mode 100644 index 000000000..3b258e7f4 --- /dev/null +++ b/package/polkit/patches/patch-configure_ac @@ -0,0 +1,54 @@ +--- polkit-0.112.orig/configure.ac 2013-09-18 18:55:09.000000000 +0200 ++++ polkit-0.112/configure.ac 2014-01-09 21:28:57.000000000 +0100 +@@ -8,9 +8,6 @@ AM_MAINTAINER_MODE + + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +-# Include external mocklibc tool for unit testing +-AC_CONFIG_SUBDIRS([test/mocklibc]) +- + # libtool versioning - this applies to all libraries in this package + # + # See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details +@@ -46,8 +43,6 @@ AC_PATH_PROG([XSLTPROC], [xsltproc]) + fi + AM_CONDITIONAL(MAN_PAGES_ENABLED, test x$enable_man_pages = xyes) + +-GTK_DOC_CHECK([1.3]) +- + #### gcc warning flags + + if test "x$GCC" = "xyes"; then +@@ -476,8 +471,6 @@ case "$host_os" in + ;; + esac + +-GOBJECT_INTROSPECTION_CHECK([0.6.2]) +- + AC_ARG_ENABLE([examples], + AS_HELP_STRING([--enable-examples], [Build the example programs]),, + [enable_examples=yes]) +@@ -488,7 +481,6 @@ AM_CONDITIONAL(BUILD_EXAMPLES, test "x$e + # Internationalization + # ******************** + +-IT_PROG_INTLTOOL([0.40.0]) + GETTEXT_PACKAGE=polkit-1 + AC_SUBST([GETTEXT_PACKAGE]) + AM_GLIB_GNU_GETTEXT +@@ -512,15 +504,6 @@ src/polkitbackend/Makefile + src/polkitagent/Makefile + src/programs/Makefile + src/examples/Makefile +-docs/version.xml +-docs/extensiondir.xml +-docs/Makefile +-docs/polkit/Makefile +-docs/man/Makefile +-po/Makefile.in +-test/Makefile +-test/polkit/Makefile +-test/polkitbackend/Makefile + ]) + + dnl ========================================================================== diff --git a/package/polkit/patches/patch-src_polkit_Makefile_am b/package/polkit/patches/patch-src_polkit_Makefile_am new file mode 100644 index 000000000..4aa7ad8a7 --- /dev/null +++ b/package/polkit/patches/patch-src_polkit_Makefile_am @@ -0,0 +1,35 @@ +--- polkit-0.112.orig/src/polkit/Makefile.am 2013-09-18 18:55:09.000000000 +0200 ++++ polkit-0.112/src/polkit/Makefile.am 2014-01-09 21:13:06.000000000 +0100 +@@ -102,32 +102,6 @@ libpolkit_gobject_1_la_LIBADD = + + libpolkit_gobject_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)' + +-if HAVE_INTROSPECTION +- +-INTROSPECTION_GIRS = Polkit-1.0.gir +- +-Polkit-1.0.gir: libpolkit-gobject-1.la +- +-girdir = $(INTROSPECTION_GIRDIR) +-gir_DATA = Polkit-1.0.gir +- +-typelibsdir = $(INTROSPECTION_TYPELIBDIR) +-typelibs_DATA = Polkit-1.0.typelib +- +-Polkit_1_0_gir_INCLUDES = Gio-2.0 +-Polkit_1_0_gir_SCANNERFLAGS = --c-include='polkit/polkit.h' +-Polkit_1_0_gir_CFLAGS = \ +- $(libpolkit_gobject_1_la_CFLAGS) \ +- -D_POLKIT_COMPILATION \ +- -I.. -I$(top_srcdir)/src +-Polkit_1_0_gir_LIBS = libpolkit-gobject-1.la +-Polkit_1_0_gir_FILES = $(libpolkit_gobject_1_la_SOURCES) +-Polkit_1_0_gir_EXPORT_PACKAGES = polkit-gobject-1 +- +-include $(INTROSPECTION_MAKEFILE) +- +-endif # HAVE_INTROSPECTION +- + EXTRA_DIST = polkitenumtypes.h.template polkitenumtypes.c.template + CLEANFILES = $(gir_DATA) $(typelibs_DATA) + diff --git a/package/polkit/patches/patch-src_polkitagent_Makefile_am b/package/polkit/patches/patch-src_polkitagent_Makefile_am new file mode 100644 index 000000000..7a5aaeea1 --- /dev/null +++ b/package/polkit/patches/patch-src_polkitagent_Makefile_am @@ -0,0 +1,37 @@ +--- polkit-0.112.orig/src/polkitagent/Makefile.am 2013-09-18 18:55:09.000000000 +0200 ++++ polkit-0.112/src/polkitagent/Makefile.am 2014-01-09 21:13:36.000000000 +0100 +@@ -109,34 +109,6 @@ polkit_agent_helper_1_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(NULL) + +-if HAVE_INTROSPECTION +- +-girdir = $(INTROSPECTION_GIRDIR) +-gir_DATA = PolkitAgent-1.0.gir +- +-PolkitAgent-1.0.gir: libpolkit-agent-1.la +- +-typelibsdir = $(INTROSPECTION_TYPELIBDIR) +-typelibs_DATA = PolkitAgent-1.0.typelib +- +-INTROSPECTION_COMPILER_ARGS = --includedir=../../src/polkit +-INTROSPECTION_GIRS = PolkitAgent-1.0.gir +-PolkitAgent_1_0_gir_INCLUDES = Gio-2.0 +-PolkitAgent_1_0_gir_SCANNERFLAGS = \ +- --include-uninstalled=../../src/polkit/Polkit-1.0.gir \ +- --c-include='polkitagent/polkitagent.h' +-PolkitAgent_1_0_gir_CFLAGS = \ +- $(libpolkit_agent_1_la_CFLAGS) \ +- -D_POLKIT_COMPILATION \ +- -D_POLKIT_AGENT_COMPILATION \ +- -I.. -I$(top_srcdir)/src +-PolkitAgent_1_0_gir_LIBS = libpolkit-agent-1.la +-PolkitAgent_1_0_gir_FILES = $(libpolkit_agent_1_la_SOURCES) +-PolkitAgent_1_0_gir_EXPORT_PACKAGES = polkit-agent-1 +- +-include $(INTROSPECTION_MAKEFILE) +- +-endif # HAVE_INTROSPECTION + + # polkit-agent-helper-1 need to be setuid root because it's used to + # authenticate not only the invoking user, but possibly also root |