[Pkg-cli-apps-commits] [sparkleshare] 05/10: Add build patches by Thanh Tung Nguyen.

[Andrew Shadura]

This is an automated email from the git hooks/post-receive script.

andrewsh pushed a commit to branch master
in repository sparkleshare.

commit 24b2408032518ba48b40c062e4e6070452d1d437
Author: Andrew Shadura <andrew.shadura at collabora.co.uk>
Date:   Mon Jan 18 13:57:10 2016 +0100

    Add build patches by Thanh Tung Nguyen.
---
 debian/patches/01-enable_tests_conditional.patch | 28 +++++++++++++++++++
 debian/patches/02-m4_macro_dir.patch             | 35 ++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/debian/patches/01-enable_tests_conditional.patch b/debian/patches/01-enable_tests_conditional.patch
new file mode 100644
index 0000000..88ca15c
--- /dev/null
+++ b/debian/patches/01-enable_tests_conditional.patch
@@ -0,0 +1,28 @@
+Description: Fix a test in order to use autoreconf
+Author: Thanh Tung Nguyen <thngtong at gmail.com>
+Forwarded: no
+Last-Update: 2014-04-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/build/build.rules.mk
++++ b/build/build.rules.mk
+@@ -19,7 +19,7 @@
+ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
+ 
+ if ENABLE_TESTS
+-    LINK = " $(NUNIT_LIBS)"
++    LINK_NUNIT = "$(NUNIT_LIBS)"
+     ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
+ endif
+ 
+--- a/build/build.environment.mk
++++ b/build/build.environment.mk
+@@ -19,7 +19,7 @@
+ LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll
+ LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB)
+ 
+-REF_SPARKLESHARE = $(LINK_GTK) $(LINK_SPARKLELIB_DEPS) $(LINK_APP_INDICATOR) $(LINK_WEBKIT)
++REF_SPARKLESHARE = $(LINK_NUNIT) $(LINK_GTK) $(LINK_SPARKLELIB_DEPS) $(LINK_APP_INDICATOR) $(LINK_WEBKIT)
+ 
+ # Cute hack to replace a space with something
+ colon:= :
diff --git a/debian/patches/02-m4_macro_dir.patch b/debian/patches/02-m4_macro_dir.patch
new file mode 100644
index 0000000..5a3ba3d
--- /dev/null
+++ b/debian/patches/02-m4_macro_dir.patch
@@ -0,0 +1,35 @@
+Description: Add correctly the m4 macros directories
+Author: Thanh Tung Nguyen <thngtong at gmail.com>
+Forwarded: no
+Last-Update: 2013-12-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,5 @@
++ACLOCAL_AMFLAGS = -I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave
++
+ basedirs = build SparkleLib SparkleLib/Git
+ 
+ SUBDIRS = $(basedirs) $(GUISUBDIRS)
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,6 +5,9 @@
+ AC_INIT([SparkleShare], sparkleshare_version)
+ AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign tar-pax])
+ AM_MAINTAINER_MODE
++LT_INIT
++
++AC_CONFIG_MACRO_DIRS([build/m4/sparkleshare build/m4/shamrock build/m4/shave])
+ 
+ dnl Export Version Info
+ AC_SUBST([ASM_VERSION], [sparkleshare_version])
+@@ -15,8 +18,6 @@
+         AC_MSG_ERROR([You need to install pkg-config])
+ fi
+ 
+-AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"])
+-
+ SHAMROCK_EXPAND_LIBDIR
+ SHAMROCK_EXPAND_BINDIR
+ SHAMROCK_EXPAND_DATADIR

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/sparkleshare.git