From c3c20ce2dfb4bd80fd4f82fae8c139c9ac7bcc8c Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 28 May 2016 11:03:54 +0200 Subject: [PATCH] Debian pkg: adjustments for wheezy. --- debian/patches/0002-Glib-old-version.patch | 40 ++++++++++++ .../0003-Glib-old-version-gobject-macro.patch | 65 +++++++++++++++++++ ...ort-function-g_key_file_save_to_file.patch | 41 ++++++++++++ debian/patches/0005-No-tests.patch | 18 +++++ debian/patches/series | 4 ++ 5 files changed, 168 insertions(+) create mode 100644 debian/patches/0002-Glib-old-version.patch create mode 100644 debian/patches/0003-Glib-old-version-gobject-macro.patch create mode 100644 debian/patches/0004-Backport-function-g_key_file_save_to_file.patch create mode 100644 debian/patches/0005-No-tests.patch diff --git a/debian/patches/0002-Glib-old-version.patch b/debian/patches/0002-Glib-old-version.patch new file mode 100644 index 0000000..5b6d8fe --- /dev/null +++ b/debian/patches/0002-Glib-old-version.patch @@ -0,0 +1,40 @@ +From: Andrea Zagli +Date: Wed, 25 May 2016 16:43:59 +0200 +Subject: Glib old version. + +--- + configure.ac | 8 ++++---- + libzakcgi.pc.in | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a02bbbf..b4aaa88 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,10 +30,10 @@ AC_PROG_LIBTOOL + AC_PROG_RANLIB + + # Checks for libraries. +-PKG_CHECK_MODULES(ZAKCGI, [glib-2.0 >= 2.36 +- gobject-2.0 >= 2.36 +- gio-2.0 >= 2.36 +- gio-unix-2.0 >= 2.36 ++PKG_CHECK_MODULES(ZAKCGI, [glib-2.0 >= 2.32 ++ gobject-2.0 >= 2.32 ++ gio-2.0 >= 2.32 ++ gio-unix-2.0 >= 2.32 + libzakform >= 0.0.1 + libzakformini]) + +diff --git a/libzakcgi.pc.in b/libzakcgi.pc.in +index 5b736f5..4b9bac0 100644 +--- a/libzakcgi.pc.in ++++ b/libzakcgi.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: @PACKAGE_NAME@ + Description: Class for CGI. + Version: @PACKAGE_VERSION@ +-Requires: glib-2.0 >= 2.36 gobject-2.0 gio-2.0 gio-unix-2.0 libzakform libzakformini ++Requires: glib-2.0 >= 2.32 gobject-2.0 gio-2.0 gio-unix-2.0 libzakform libzakformini + Libs: -L${libdir} -lzakcgi + Cflags: -I${includedir} diff --git a/debian/patches/0003-Glib-old-version-gobject-macro.patch b/debian/patches/0003-Glib-old-version-gobject-macro.patch new file mode 100644 index 0000000..a0215ec --- /dev/null +++ b/debian/patches/0003-Glib-old-version-gobject-macro.patch @@ -0,0 +1,65 @@ +From: Andrea Zagli +Date: Mon, 30 May 2016 09:09:16 +0200 +Subject: Glib old version - gobject macro. + +--- + src/form.h | 17 +++++++++++++++-- + src/formelement.h | 17 +++++++++++++++-- + 2 files changed, 30 insertions(+), 4 deletions(-) + +diff --git a/src/form.h b/src/form.h +index 01fb475..416903a 100644 +--- a/src/form.h ++++ b/src/form.h +@@ -31,8 +31,21 @@ + G_BEGIN_DECLS + + +-#define ZAK_CGI_TYPE_FORM zak_cgi_form_get_type () +-G_DECLARE_DERIVABLE_TYPE (ZakCgiForm, zak_cgi_form, ZAK_CGI, FORM, ZakFormForm) ++#define ZAK_CGI_TYPE_FORM (zak_cgi_form_get_type ()) ++#define ZAK_CGI_FORM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_CGI_TYPE_FORM, ZakCgiForm)) ++#define ZAK_CGI_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_CGI_TYPE_FORM, ZakCgiFormClass)) ++#define ZAK_CGI_IS_FORM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_CGI_TYPE_FORM)) ++#define ZAK_CGI_IS_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_CGI_TYPE_FORM)) ++#define ZAK_CGI_FORM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_CGI_TYPE_FORM, ZakCgiFormClass)) ++ ++ ++typedef struct _ZakCgiForm ZakCgiForm; ++typedef struct _ZakCgiFormClass ZakCgiFormClass; ++ ++struct _ZakCgiForm ++ { ++ ZakFormForm parent; ++ }; + + struct _ZakCgiFormClass + { +diff --git a/src/formelement.h b/src/formelement.h +index 50d5822..a6d9004 100644 +--- a/src/formelement.h ++++ b/src/formelement.h +@@ -30,8 +30,21 @@ + G_BEGIN_DECLS + + +-#define ZAK_CGI_TYPE_FORM_ELEMENT zak_cgi_form_element_get_type () +-G_DECLARE_DERIVABLE_TYPE (ZakCgiFormElement, zak_cgi_form_element, ZAK_CGI, FORM_ELEMENT, ZakFormElement) ++#define ZAK_CGI_TYPE_FORM_ELEMENT (zak_cgi_form_element_get_type ()) ++#define ZAK_CGI_FORM_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_CGI_TYPE_FORM_ELEMENT, ZakCgiFormElement)) ++#define ZAK_CGI_FORM_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_CGI_TYPE_FORM_ELEMENT, ZakCgiFormElementClass)) ++#define ZAK_CGI_IS_FORM_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_CGI_TYPE_FORM_ELEMENT)) ++#define ZAK_CGI_IS_FORM_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_CGI_TYPE_FORM_ELEMENT)) ++#define ZAK_CGI_FORM_ELEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_CGI_TYPE_FORM_ELEMENT, ZakCgiFormElementClass)) ++ ++ ++typedef struct _ZakCgiFormElement ZakCgiFormElement; ++typedef struct _ZakCgiFormElementClass ZakCgiFormElementClass; ++ ++struct _ZakCgiFormElement ++ { ++ ZakFormElement parent; ++ }; + + struct _ZakCgiFormElementClass + { diff --git a/debian/patches/0004-Backport-function-g_key_file_save_to_file.patch b/debian/patches/0004-Backport-function-g_key_file_save_to_file.patch new file mode 100644 index 0000000..0f7cecc --- /dev/null +++ b/debian/patches/0004-Backport-function-g_key_file_save_to_file.patch @@ -0,0 +1,41 @@ +From: Andrea Zagli +Date: Sat, 28 May 2016 10:58:15 +0200 +Subject: Backport function g_key_file_save_to_file. + +--- + src/session.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/src/session.c b/src/session.c +index aa8d0bc..81100a7 100644 +--- a/src/session.c ++++ b/src/session.c +@@ -116,6 +116,28 @@ zak_cgi_session_init (ZakCgiSession *zak_cgi_session) + priv->minutes = MINUTES_DEFAULT; + } + ++gboolean ++g_key_file_save_to_file (GKeyFile *key_file, ++ const gchar *filename, ++ GError **error) ++{ ++ gchar *contents; ++ gboolean success; ++ gsize length; ++ ++ g_return_val_if_fail (key_file != NULL, FALSE); ++ g_return_val_if_fail (filename != NULL, FALSE); ++ g_return_val_if_fail (error == NULL || *error == NULL, FALSE); ++ ++ contents = g_key_file_to_data (key_file, &length, NULL); ++ g_assert (contents != NULL); ++ ++ success = g_file_set_contents (filename, contents, length, error); ++ g_free (contents); ++ ++ return success; ++} ++ + /** + * zak_cgi_session_new: + * @zakcgimain: diff --git a/debian/patches/0005-No-tests.patch b/debian/patches/0005-No-tests.patch new file mode 100644 index 0000000..f2d52d1 --- /dev/null +++ b/debian/patches/0005-No-tests.patch @@ -0,0 +1,18 @@ +From: Andrea Zagli +Date: Sat, 28 May 2016 11:00:30 +0200 +Subject: No tests. + +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index c87fc2b..72c9b28 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = src tests ++SUBDIRS = src + + ACLOCAL_AMFLAGS = -I m4 + diff --git a/debian/patches/series b/debian/patches/series index c779459..1112385 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,5 @@ 0001-DESTDIR-support.patch +0002-Glib-old-version.patch +0003-Glib-old-version-gobject-macro.patch +0004-Backport-function-g_key_file_save_to_file.patch +0005-No-tests.patch -- 2.49.0