diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-23 09:17:50 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-23 09:17:50 +0200 |
| commit | e7c80abb6d223e56a9d843b7c18021565c672c28 (patch) | |
| tree | f29803d0e4243f5d31ac4015a80fb474ae55fc7c /debian/patches | |
| parent | 4ea2cc3bd4a7d9b1c54a9d33e6a1cf82e7c8c21d (diff) | |
Initial import of shotwell version 0.18.10.18.1
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/hardening.patch | 25 | ||||
| -rw-r--r-- | debian/patches/libexec.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 43 insertions, 0 deletions
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch new file mode 100644 index 0000000..bb855fb --- /dev/null +++ b/debian/patches/hardening.patch @@ -0,0 +1,25 @@ +Description: pass compiler flags set in debian/rules to compiler +Author: Devid Antonio Filoni <d.filoni@ubuntu.com> + +Index: shotwell-0.15.0/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 +@@ -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) + ifdef UNITY_SUPPORT + VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT + endif +@@ -673,7 +673,7 @@ + @ + + $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile +- $(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $< ++ $(CC) -c $(VALA_CFLAGS) $(CPPFLAGS) $(CFLAGS) -o $@ $< + + $(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 $@ diff --git a/debian/patches/libexec.patch b/debian/patches/libexec.patch new file mode 100644 index 0000000..0e06218 --- /dev/null +++ b/debian/patches/libexec.patch @@ -0,0 +1,16 @@ +Description: do not install files in libexec directory +Author: Luca Falavigna <dktrkranz@debian.org> + +Index: shotwell-0.15.0/Makefile +=================================================================== +--- shotwell-0.15.0.orig/Makefile 2013-10-13 09:51:58.893357001 +0200 ++++ shotwell-0.15.0/Makefile 2013-10-13 09:54:33.885361749 +0200 +@@ -27,7 +27,7 @@ + + -include configure.mk + ifndef LIBEXECDIR +-LIBEXECDIR=$(PREFIX)/libexec/shotwell ++LIBEXECDIR=$(PREFIX)/share/shotwell + endif + + CORE_SUPPORTED_LANGUAGES=$(shell cat po/LINGUAS) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..2535d18 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +hardening.patch +libexec.patch |