From 33f679ebdd984f48ef8cee955d16da758be70b7b Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 24 Jun 2017 11:03:47 +0200 Subject: [PATCH] Debian pkg: updates from upstream (start patching). --- debian/changelog | 30 +++++++++-- debian/control | 2 +- debian/libzakform-dev.install | 1 + debian/libzakform.install | 3 +- debian/patches/0001-DESTDIR-support.patch | 5 +- debian/patches/0002-aclocal-old-version.patch | 2 +- .../0005-Glib-old-version-private.patch | 52 +++++-------------- ...0006-Some-new-functions-not-replaced.patch | 2 +- .../0009-Glib-old-version-private.patch | 9 ---- debian/rules | 7 ++- 10 files changed, 55 insertions(+), 58 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6aa1ad3..3679fa6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -libzakform (0.0.1-4~6.gbp93b859) UNRELEASED; urgency=medium +libzakform (0.0.1-4~7.gbpdc0f58) UNRELEASED; urgency=medium - ** SNAPSHOT build @93b859fdaee31093247b0f27ff27ab846e1b83ee ** + ** SNAPSHOT build @dc0f58a402c4d3b9c900adf1eb54ec569f91029c ** [ Andrea Zagli ] * Initial release @@ -55,4 +55,28 @@ libzakform (0.0.1-4~6.gbp93b859) UNRELEASED; urgency=medium [ tux ] - -- tux Sat, 27 May 2017 09:19:02 +0200 + [ Andrea Zagli ] + * Debian pkg: locale files in dev (closes #1121). + * Enabled gtk-doc. + * Enabled gir. + * Added private function ZakForm::get_module_new. + * Renamed function ZakFormForm::get_form_element_validator. + * Added function ZakFormForm::get_form_element_filter. + * Use of ZakFormForm::get_module_new in FormValidator construct from xml. + * Make public function ZakFormElement::xml_parsing. + * Added function ZakFormForm::get_form_element. + * Added some member functions to ZakFormElement. + * Added class ZakFormElementExtension. + * Moved functions ZakFormForm::get_form_* to commons. + * Moved function ZakFormForm::element_xml_parsing in ZakFormElement. + * Start of implementation of FormElementArray. + * Added function ZakFormElementArray::get_element_by_id. + * Wrong comparision value in ZakForm*ValidatorCompare*. + * Implemented functions ZakFormElementArray::[gs]et_visible. + * Implemented functions ZakFormElementArray::[gs]et_editable. + * Implemented functions ZakFormElementArray::is_valid. + * Implemented functions ZakFormElementArray::is_changed. + + [ tux ] + + -- tux Sat, 24 Jun 2017 10:34:40 +0200 diff --git a/debian/control b/debian/control index 43a1eee..fc5d864 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libzakform Priority: optional Maintainer: Andrea Zagli -Build-Depends: debhelper (>=9), libzakutils-dev, intltool, pkg-config, gtk-doc-tools, libxml2-dev +Build-Depends: debhelper (>=9), libzakutils-dev, intltool, pkg-config, gtk-doc-tools, gobject-introspection, libgirepository1.0-dev, libxml2-dev Standards-Version: 3.9.8 Section: libs Homepage: http://saetta.ns0.it diff --git a/debian/libzakform-dev.install b/debian/libzakform-dev.install index dde0009..4a419f3 100644 --- a/debian/libzakform-dev.install +++ b/debian/libzakform-dev.install @@ -2,3 +2,4 @@ usr/lib/*/libzakform.a usr/lib/*/libzakform.la usr/lib/*/pkgconfig/* usr/include/libzakform* +usr/share/gtk-doc/* diff --git a/debian/libzakform.install b/debian/libzakform.install index 86af80a..e902df3 100644 --- a/debian/libzakform.install +++ b/debian/libzakform.install @@ -1,3 +1,4 @@ usr/lib/*/libzakform*.so* usr/lib/*/libzakform/modules -usr/share/locale/* \ No newline at end of file +usr/share/locale/* +usr/lib/*/girepository-1.0/* \ No newline at end of file diff --git a/debian/patches/0001-DESTDIR-support.patch b/debian/patches/0001-DESTDIR-support.patch index 5f287e8..faad663 100644 --- a/debian/patches/0001-DESTDIR-support.patch +++ b/debian/patches/0001-DESTDIR-support.patch @@ -10,7 +10,7 @@ diff --git a/src/Makefile.am b/src/Makefile.am index 6c6f9b6..ee33785 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -55,7 +55,7 @@ libzakform_include_HEADERS = \ +@@ -62,10 +62,10 @@ libzakform_includedir = $(includedir)/libzakform install-exec-hook: @@ -20,3 +20,6 @@ index 6c6f9b6..ee33785 100644 uninstall-hook: - rm -rf "$(libdir)/$(PACKAGE)" + rm -rf "$(DESTDIR)$(libdir)/$(PACKAGE)" + + CLEANFILES = + diff --git a/debian/patches/0002-aclocal-old-version.patch b/debian/patches/0002-aclocal-old-version.patch index bb3a293..22e3225 100644 --- a/debian/patches/0002-aclocal-old-version.patch +++ b/debian/patches/0002-aclocal-old-version.patch @@ -17,5 +17,5 @@ index 83f5de2..9e5ebc4 100755 -aclocal --install || exit 1 +aclocal --install -I m4 || exit 1 glib-gettextize --force --copy || exit 1 - #gtkdocize --copy || exit 1 + gtkdocize --copy || exit 1 intltoolize --force --copy --automake || exit 1 diff --git a/debian/patches/0005-Glib-old-version-private.patch b/debian/patches/0005-Glib-old-version-private.patch index cbc8e3c..a933969 100644 --- a/debian/patches/0005-Glib-old-version-private.patch +++ b/debian/patches/0005-Glib-old-version-private.patch @@ -26,15 +26,15 @@ diff --git a/src/form.c b/src/form.c index 226ca90..03c076f 100644 --- a/src/form.c +++ b/src/form.c -@@ -57,6 +57,8 @@ static void zak_form_form_finalize (GObject *gobject); - - static void zak_form_form_load_modules (ZakFormForm *zakform); +@@ -51,6 +51,8 @@ + static void zak_form_form_dispose (GObject *gobject); + static void zak_form_form_finalize (GObject *gobject); +#define ZAK_FORM_FORM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_FORM, ZakFormFormPrivate)) + typedef struct { - GPtrArray *ar_modules; + GPtrArray *ar_elements; @@ -65,7 +67,7 @@ typedef struct GPtrArray *ar_messages; } ZakFormFormPrivate; @@ -53,24 +53,6 @@ index 226ca90..03c076f 100644 class->get_elements = zak_form_form_get_elements; } -@@ -170,7 +174,7 @@ zak_form_form_element_xml_parsing (ZakFormForm *zakform, ZakFormElement *element - gboolean to_unlink; - xmlNode *xnode_tmp; - -- priv = zak_form_form_get_instance_private (zakform); -+ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform); - - xnode = xnode->children; - while (xnode) -@@ -356,7 +360,7 @@ zak_form_form_load_from_xml (ZakFormForm *zakform, xmlDoc *xmldoc) - { - ret = TRUE; - -- priv = zak_form_form_get_instance_private (zakform); -+ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform); - - cur = cur->children; - while (cur) @@ -497,7 +501,7 @@ zak_form_form_add_element (ZakFormForm *zakform, ZakFormElement *element) ZakFormFormPrivate *priv; @@ -224,22 +206,13 @@ index 226ca90..03c076f 100644 -@@ -984,7 +988,7 @@ zak_form_form_load_modules (ZakFormForm* zakform) - - if (g_module_supported ()) - { -- priv = zak_form_form_get_instance_private (zakform); -+ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform); - - modulesdir = (gchar *)g_getenv ("LIBZAKFORM_MODULESDIR"); - if (modulesdir == NULL) diff --git a/src/formelement.c b/src/formelement.c index eb9a601..ea3542c 100644 --- a/src/formelement.c +++ b/src/formelement.c -@@ -65,6 +65,8 @@ static void zak_form_element_finalize (GObject *gobject); - - static void zak_form_element_xml_parsing (ZakFormElement *element, xmlNode *xmlnode); +@@ -66,6 +65,8 @@ + static void zak_form_element_dispose (GObject *gobject); + static void zak_form_element_finalize (GObject *gobject); +#define ZAK_FORM_ELEMENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_ELEMENT, ZakFormElementPrivate)) + @@ -255,9 +228,8 @@ index eb9a601..ea3542c 100644 static void zak_form_element_class_init (ZakFormElementClass *class) -@@ -100,6 +102,8 @@ zak_form_element_class_init (ZakFormElementClass *class) - - class->xml_parsing = zak_form_element_xml_parsing; +@@ -100,5 +102,7 @@ zak_form_element_class_init (ZakFormElementClass *class) + object_class->finalize = zak_form_element_finalize; + g_type_class_add_private (object_class, sizeof (ZakFormElementPrivate)); + @@ -489,15 +461,15 @@ index eb9a601..ea3542c 100644 return priv->to_save; } -@@ -1246,7 +1250,7 @@ zak_form_element_clear (ZakFormElement *element) +@@ -1259,7 +1259,7 @@ zak_form_element_clear (ZakFormElement *element) { ZakFormElementPrivate *priv; - priv = zak_form_element_get_instance_private (element); + priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element); - zak_form_element_set_value_gvalue (element, priv->default_value); - } + if (ZAK_FORM_ELEMENT_GET_CLASS (element)->clear != NULL) + { @@ -1314,7 +1318,7 @@ zak_form_element_is_valid (ZakFormElement *element) ZakFormElementClass *klass = ZAK_FORM_ELEMENT_GET_CLASS (element); diff --git a/debian/patches/0006-Some-new-functions-not-replaced.patch b/debian/patches/0006-Some-new-functions-not-replaced.patch index 0995c76..245d700 100644 --- a/debian/patches/0006-Some-new-functions-not-replaced.patch +++ b/debian/patches/0006-Some-new-functions-not-replaced.patch @@ -20,8 +20,8 @@ index 03c076f..4d6a76a 100644 - ZakFormFormPrivate *priv = zak_form_form_get_instance_private (zak_form_form); + ZakFormFormPrivate *priv = ZAK_FORM_FORM_GET_PRIVATE (zak_form_form); - priv->ar_modules = NULL; priv->ar_elements = g_ptr_array_new (); + priv->ar_validators = g_ptr_array_new (); diff --git a/src/formelement.c b/src/formelement.c index ea3542c..93b29c4 100644 --- a/src/formelement.c diff --git a/debian/patches/0009-Glib-old-version-private.patch b/debian/patches/0009-Glib-old-version-private.patch index a6a0e4b..450184b 100644 --- a/debian/patches/0009-Glib-old-version-private.patch +++ b/debian/patches/0009-Glib-old-version-private.patch @@ -14,15 +14,6 @@ diff --git a/src/form.c b/src/form.c index db77782..3090dde 100644 --- a/src/form.c +++ b/src/form.c -@@ -300,7 +300,7 @@ zak_form_get_form_element_validator (ZakFormForm *zakform, const gchar *namespac - - g_return_val_if_fail (ZAK_FORM_IS_FORM (zakform), NULL); - -- priv = zak_form_form_get_instance_private (zakform); -+ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform); - - validator_constructor = NULL; - @@ -627,7 +627,7 @@ ZakFormValidator guint i; diff --git a/debian/rules b/debian/rules index dc0ef3d..b7397a6 100755 --- a/debian/rules +++ b/debian/rules @@ -14,13 +14,18 @@ #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_CFLAGS_MAINT_STRIP = -Werror=format-security +export DEB_CPPFLAGS_MAINT_STRIP = -Werror=format-security +export DEB_CXXFLAGS_MAINT_STRIP = -Werror=format-security + + %: dh $@ override_dh_auto_configure: NOCONFIGURE="X" ./autogen.sh - dh_auto_configure + dh_auto_configure -- --enable-introspection --enable-gtk-doc override_dh_auto_install: $(MAKE) DESTDIR=$$(pwd)/debian/tmp prefix=/usr install -- 2.49.0