diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-10-09 11:54:44 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-10-09 11:54:44 +0200 |
| commit | 1c172114dfae26e3861c65510b45d9f6b7bdab67 (patch) | |
| tree | 78286d240470304704a5f5dbfe188538400c3739 | |
| parent | 021b663419ce8524fe1bd3f928062bef96f215c4 (diff) | |
remove valac flag --fatal-warnings
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/hardening.patch | 23 |
2 files changed, 26 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index fadf314..6308220 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +shotwell (0.20.0-2) unstable; urgency=medium + + * debian/patch/hardening.patch: + - Add removal of --fatal-warnings at plugins/Makefile.plugins.mk + to prevent build errors on armel and mips. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 09 Oct 2014 08:59:04 +0200 + shotwell (0.20.0-1) unstable; urgency=medium * New upstream release (Closes: #762357). diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch index bb855fb..44c59c5 100644 --- a/debian/patches/hardening.patch +++ b/debian/patches/hardening.patch @@ -1,20 +1,20 @@ Description: pass compiler flags set in debian/rules to compiler Author: Devid Antonio Filoni <d.filoni@ubuntu.com> -Index: shotwell-0.15.0/Makefile +Index: trunk/Makefile =================================================================== ---- shotwell-0.15.0.orig/Makefile 2013-10-04 02:23:04.000000000 +0200 -+++ shotwell-0.15.0/Makefile 2013-10-13 09:51:58.893357001 +0200 +--- trunk.orig/Makefile 2014-10-09 08:02:24.871560620 +0200 ++++ trunk/Makefile 2014-10-09 08:02:24.867560531 +0200 @@ -35,7 +35,7 @@ LOCAL_LANG_DIR=locale-langpack SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale -VALAFLAGS := -g --enable-checking --target-glib=2.32 --thread --fatal-warnings --enable-experimental --enable-deprecated $(USER_VALAFLAGS) -+VALAFLAGS := $(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w)) --enable-checking --target-glib=2.32 --thread --fatal-warnings --enable-experimental --enable-deprecated $(USER_VALAFLAGS) ++VALAFLAGS := $(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w)) --enable-checking --target-glib=2.32 --thread --enable-experimental --enable-deprecated $(USER_VALAFLAGS) ifdef UNITY_SUPPORT VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT endif -@@ -673,7 +673,7 @@ +@@ -671,7 +671,7 @@ @ $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile @@ -23,3 +23,16 @@ Index: shotwell-0.15.0/Makefile $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) misc/gschemas.compiled $(DOC_LANG_STAMP) $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@ +Index: trunk/plugins/Makefile.plugin.mk +=================================================================== +--- trunk.orig/plugins/Makefile.plugin.mk 2014-03-04 23:54:12.000000000 +0100 ++++ trunk/plugins/Makefile.plugin.mk 2014-10-09 08:02:56.340224031 +0200 +@@ -41,7 +41,7 @@ + all: $(PLUGIN).so + + .stamp: $(SRC_FILES) $(MAKE_FILES) $(HEADER_FILES) +- $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --fatal-warnings --save-temps --compile --enable-deprecated \ ++ $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --save-temps --compile --enable-deprecated \ + --vapidir=../ $(foreach pkg,$(PKGS),--pkg=$(pkg)) $(foreach pkg,$(CUSTOM_VAPI_PKGS),--pkg=$(pkg)) \ + -X -I../.. -X -fPIC \ + $(foreach dfn,$(DEFINES),-X $(dfn)) \ |