summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0001-buildflags.patch2
-rw-r--r--debian/patches/0005-hardening.patch8
-rw-r--r--debian/patches/series4
3 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/0001-buildflags.patch b/debian/patches/0001-buildflags.patch
index dbce802..91ca3a0 100644
--- a/debian/patches/0001-buildflags.patch
+++ b/debian/patches/0001-buildflags.patch
@@ -7,7 +7,7 @@ Index: trunk/Makefile
===================================================================
--- trunk.orig/Makefile
+++ trunk/Makefile
-@@ -402,8 +402,8 @@ PLUGIN_CFLAGS = -O2 -g -pipe
+@@ -385,8 +385,8 @@ PLUGIN_CFLAGS = -O2 -g -pipe
endif
endif
diff --git a/debian/patches/0005-hardening.patch b/debian/patches/0005-hardening.patch
index a579867..c8abeea 100644
--- a/debian/patches/0005-hardening.patch
+++ b/debian/patches/0005-hardening.patch
@@ -14,7 +14,7 @@ Index: trunk/Makefile
ifdef UNITY_SUPPORT
VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT
endif
-@@ -676,7 +676,7 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
+@@ -661,7 +661,7 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
@
$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
@@ -27,12 +27,12 @@ Index: trunk/plugins/Makefile.plugin.mk
===================================================================
--- trunk.orig/plugins/Makefile.plugin.mk
+++ trunk/plugins/Makefile.plugin.mk
-@@ -42,7 +42,7 @@ DEFINES := -D_VERSION='"$(PLUGINS_VERSIO
- all: $(PLUGIN).so
+@@ -42,7 +42,7 @@ PLUGIN_EXTRAFLAGS ?= --vapidir=../common
+ PLUGIN_EXTRALINKFLAGS ?= -L../common/ -lshotwell-plugin-common
.stamp: $(SRC_FILES) $(MAKE_FILES) $(HEADER_FILES)
- $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --fatal-warnings --ccode --enable-deprecated \
+ $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --ccode --enable-deprecated \
--vapidir=../ $(foreach pkg,$(PKGS),--pkg=$(pkg)) $(foreach pkg,$(CUSTOM_VAPI_PKGS),--pkg=$(pkg)) \
$(USER_VALAFLAGS) \
- --vapidir=../../vapi \
+ $(PLUGIN_EXTRAFLAGS) \
diff --git a/debian/patches/series b/debian/patches/series
index 2b6f8ff..76f5192 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,5 @@
#0502-Have-all-soup-sessions-validate-TLS-certificates.patch
#0503-facebook-Dont-disable-XSS-auditor.patch
0100-ios8.patch
-0510-Delay_size_request.patch
-0515-Fix_background_color_drawing.patch
+#0510-Delay_size_request.patch
+#0515-Fix_background_color_drawing.patch