diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2014-10-16 23:26:41 -0400 |
|---|---|---|
| committer | Hans-Christoph Steiner <hans@eds.org> | 2014-10-16 23:26:41 -0400 |
| commit | f0c2894038e5b616b80fd639571d7afbe14c1b08 (patch) | |
| tree | d50cb7595c5fab1ac40509582da9e330f52f8b6e | |
| parent | 121be71cab384e98755def99c2c4dc3dc82806ac (diff) | |
update patches to apply to sqlcipher 3.2.0
| -rw-r--r-- | debian/patches/10-520478-squash-bad-deps.patch | 6 | ||||
| -rw-r--r-- | debian/patches/20-change-name-to-sqlcipher.patch | 8 | ||||
| -rw-r--r-- | debian/patches/32-fix-pkgconfig-libname.patch | 9 |
3 files changed, 10 insertions, 13 deletions
diff --git a/debian/patches/10-520478-squash-bad-deps.patch b/debian/patches/10-520478-squash-bad-deps.patch index e7a1276..a03e025 100644 --- a/debian/patches/10-520478-squash-bad-deps.patch +++ b/debian/patches/10-520478-squash-bad-deps.patch @@ -1,13 +1,13 @@ --- sqlcipher-3.2.0.orig/Makefile.in +++ sqlcipher-3.2.0/Makefile.in -@@ -509,18 +509,20 @@ sqlcipher.pc: $(TOP)/sqlcipher.pc.in +@@ -530,18 +530,20 @@ sqlcipher.pc: $(TOP)/sqlcipher.pc.in libsqlcipher.la: $(LIBOBJ) - $(LTLINK) -no-undefined -o $@ $(LIBOBJ) $(TLIBS) \ + $(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \ ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" + sed -i "/dependency_libs/s/'.*'/''/" $@ libtclsqlite3.la: tclsqlite.lo libsqlcipher.la - $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ + $(LTLINK) -o $@ tclsqlite.lo \ - libsqlcipher.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ + libsqlcipher.la @TCL_STUB_LIB_SPEC@ \ -rpath "$(TCLLIBDIR)" \ diff --git a/debian/patches/20-change-name-to-sqlcipher.patch b/debian/patches/20-change-name-to-sqlcipher.patch index 934e1c8..4d02dda 100644 --- a/debian/patches/20-change-name-to-sqlcipher.patch +++ b/debian/patches/20-change-name-to-sqlcipher.patch @@ -1,7 +1,7 @@ -diff --git a/VERSION b/VERSION -index c77a7de..50ffc5a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ --3.7.17 -+2.2.1 +-3.8.6 +\ No newline at end of file ++3.2.0 +\ No newline at end of file diff --git a/debian/patches/32-fix-pkgconfig-libname.patch b/debian/patches/32-fix-pkgconfig-libname.patch index eaad182..5a9a920 100644 --- a/debian/patches/32-fix-pkgconfig-libname.patch +++ b/debian/patches/32-fix-pkgconfig-libname.patch @@ -1,11 +1,8 @@ --- a/sqlcipher.pc.in +++ b/sqlcipher.pc.in -@@ -8,6 +8,6 @@ includedir=@includedir@ - Name: SQLite - Description: SQL database engine - Version: @RELEASE@ --Libs: -L${libdir} -lsqlite3 -+Libs: -L${libdir} -lsqlcipher +@@ -10,4 +10,4 @@ Description: SQL database engine + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lsqlcipher Libs.private: @LIBS@ -Cflags: -I${includedir} +Cflags: -I${includedir}/sqlcipher |