Hello community, here is the log from the commit of package template-glib for openSUSE:Factory checked in at 2017-09-13 21:53:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/template-glib (Old) and /work/SRC/openSUSE:Factory/.template-glib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "template-glib" Wed Sep 13 21:53:07 2017 rev:2 rq:523538 version:3.26.0 Changes: -------- --- /work/SRC/openSUSE:Factory/template-glib/template-glib.changes 2017-08-30 16:24:35.917712232 +0200 +++ /work/SRC/openSUSE:Factory/.template-glib.new/template-glib.changes 2017-09-13 21:53:07.809763373 +0200 @@ -1,0 +2,21 @@ +Mon Sep 11 23:13:49 UTC 2017 - [email protected] + +- Update to version 3.26.0: + + Don't store build dir in generated files to help with build + reproducibility. +- Add gtk-doc BuildRequires, build documentation. +- Pass enable_tracing=false, enable_profiling=false, + with_introspection=true, with_vapi=true and enable_gtk_doc=true + to meson, ensure we build the features we want. + +------------------------------------------------------------------- +Thu Sep 7 07:57:34 UTC 2017 - [email protected] + +- Update to version 3.25.92: + + Use LGPLv2.1+ consistently. + + Fix unused variable in eval. + + Check for version-script support by the linker. + + Bump to more recent meson dependency. + + Updated translations. + +------------------------------------------------------------------- Old: ---- template-glib-3.25.3.tar.xz New: ---- template-glib-3.26.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ template-glib.spec ++++++ --- /var/tmp/diff_new_pack.I1Fp9R/_old 2017-09-13 21:53:09.313551794 +0200 +++ /var/tmp/diff_new_pack.I1Fp9R/_new 2017-09-13 21:53:09.313551794 +0200 @@ -17,15 +17,16 @@ Name: template-glib -Version: 3.25.3 +Version: 3.26.0 Release: 0 Summary: Library to help you generate text based on a template and user defined state License: LGPL-2.1+ Group: System/Libraries Url: https://git.gnome.org/browse/template-glib/ -Source0: https://download.gnome.org/sources/template-glib/3.25/template-glib-3.25.3.tar.xz +Source0: http://download.gnome.org/sources/template-glib/3.26/%{name}-%{version}.tar.xz BuildRequires: bison BuildRequires: flex +BuildRequires: gtk-doc BuildRequires: meson BuildRequires: pkgconfig BuildRequires: pkgconfig(gio-2.0) @@ -44,8 +45,8 @@ %package -n libtemplate_glib-1_0-0 Summary: Library to help you generate text based on a template and user defined state -Group: System/Libraries # Make the -lang package installable +Group: System/Libraries Provides: %{name} = %{version} %description -n libtemplate_glib-1_0-0 @@ -55,6 +56,7 @@ %package -n typelib-1_0-Template-1_0 Summary: Introspection bindings for Template-GLib +Group: System/Libraries %description -n typelib-1_0-Template-1_0 Template-GLib is a library to help you generate text based on a template and @@ -89,7 +91,13 @@ %autosetup %build -%{meson} +%{meson} \ + -Denable_tracing=false \ + -Denable_profiling=false \ + -Dwith_introspection=true \ + -Dwith_vapi=true \ + -Denable_gtk_doc=true \ + %{nil} %{meson_build} %install @@ -100,13 +108,15 @@ %postun -n libtemplate_glib-1_0-0 -p /sbin/ldconfig %files -n libtemplate_glib-1_0-0 +%license COPYING %{_libdir}/libtemplate_glib-1.0.so.0* %files -n typelib-1_0-Template-1_0 %{_libdir}/girepository-1.0/Template-1.0.typelib %files devel -%doc README.md COPYING +%doc README.md +%doc %{_datadir}/gtk-doc/html/template-glib/ %dir %{_includedir}/template-glib-1.0 %{_includedir}/template-glib-1.0/*.h %{_datadir}/gir-1.0/Template-1.0.gir ++++++ template-glib-3.25.3.tar.xz -> template-glib-3.26.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/NEWS new/template-glib-3.26.0/NEWS --- old/template-glib-3.25.3/NEWS 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/NEWS 2017-09-11 23:29:09.000000000 +0200 @@ -1,4 +1,28 @@ ============== +Version 3.26.0 +============== + +Changes in this release: + + • Don't store build dir in generated files to help with + build reproducibility. + +=============== +Version 3.25.92 +=============== + +Changes in this release: + + • Use LGPLv2.1+ consistently + • Fix unused variable in eval + • Check for version-script support by the linker + • Bump to more recent meson dependency + +Updated Translations: + + Hungarian, Spanish, Indonesian, Czech, Slovenian, Brazilian, Serbian + +============== Version 3.25.3 ============== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/meson.build new/template-glib-3.26.0/meson.build --- old/template-glib-3.25.3/meson.build 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/meson.build 2017-09-11 23:29:09.000000000 +0200 @@ -1,7 +1,7 @@ project('template-glib', 'c', - version: '3.25.3', + version: '3.26.0', license: 'LGPLv2.1+', - meson_version: '>= 0.38.1', + meson_version: '>= 0.40.1', default_options: [ 'warning_level=1', 'buildtype=debugoptimized' ], ) @@ -82,6 +82,12 @@ language: 'c' ) +# Check if we can use version scripts for ABI exports +ld_supports_version_script = cc.links(''' + int main (void) { return 0; } +''', args: '-Wl,--version-script,' + join_paths(meson.source_root(), 'src/template-glib.map')) +message('Linker supports --version-script: @0@'.format(ld_supports_version_script)) + # Setup various paths that subdirectory meson.build files need package_subdir = get_option('package_subdir') libdir = join_paths(get_option('libdir'), package_subdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/po/cs.po new/template-glib-3.26.0/po/cs.po --- old/template-glib-3.25.3/po/cs.po 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/po/cs.po 2017-09-11 23:29:09.000000000 +0200 @@ -1,16 +1,16 @@ # Czech translation for template-glib. # Copyright (C) 2016 template-glib's COPYRIGHT HOLDER # This file is distributed under the same license as the template-glib package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# Marek Černocký <[email protected]>, 2016. +# +# Marek Černocký <[email protected]>, 2016, 2017. # msgid "" msgstr "" -"Project-Id-Version: template-glib master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; -"product=template-glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-14 02:42+0000\n" -"PO-Revision-Date: 2016-03-14 04:25+0100\n" +"Project-Id-Version: template-glib\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"; +"builder&keywords=I18N+L10N&component=templates\n" +"POT-Creation-Date: 2017-06-05 10:48+0000\n" +"PO-Revision-Date: 2017-06-25 12:10+0200\n" "Last-Translator: Marek Černocký <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "Language: cs\n" @@ -20,22 +20,20 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Gtranslator 2.91.7\n" -#: ../src/tmpl-parser.c:199 +#: src/tmpl-parser.c:199 #, c-format msgid "%s() may only be called once" msgstr "Funkce %s() může být zavolána jen jednou" -#: ../src/tmpl-parser.c:211 -#, c-format +#: src/tmpl-parser.c:211 msgid "Parser does not contain an input stream" msgstr "Ve zpracování není žádný datový proud" -#: ../src/tmpl-template.c:451 -#, c-format +#: src/tmpl-template.c:454 msgid "Must parse template before expanding" msgstr "Před rozbalením je šablonu nutné zpracovat" -#: ../src/tmpl-template-locator.c:105 +#: src/tmpl-template-locator.c:105 #, c-format -msgid "Failed to locate template \"%s\"" +msgid "Failed to locate template “%s”" msgstr "Selhalo vyhledání šablony „%s“" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/po/es.po new/template-glib-3.26.0/po/es.po --- old/template-glib-3.25.3/po/es.po 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/po/es.po 2017-09-11 23:29:09.000000000 +0200 @@ -1,17 +1,17 @@ # Spanish translation for template-glib. # Copyright (C) 2016 template-glib's COPYRIGHT HOLDER # This file is distributed under the same license as the template-glib package. -# Daniel Mustieles <[email protected]>, 2016. +# Daniel Mustieles <[email protected]>, 2016, 2017. # msgid "" msgstr "" "Project-Id-Version: template-glib master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; -"product=template-glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-02-29 14:46+0000\n" -"PO-Revision-Date: 2016-02-29 16:33+0100\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"; +"builder&keywords=I18N+L10N&component=templates\n" +"POT-Creation-Date: 2017-06-05 10:48+0000\n" +"PO-Revision-Date: 2017-06-20 13:54+0200\n" "Last-Translator: Daniel Mustieles <[email protected]>\n" -"Language-Team: Español; Castellano <[email protected]>\n" +"Language-Team: es <[email protected]>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,22 +19,21 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.6\n" -#: ../src/tmpl-parser.c:199 +#: src/tmpl-parser.c:199 #, c-format msgid "%s() may only be called once" msgstr "Sólo se puede llamar una vez a %s()" -#: ../src/tmpl-parser.c:211 -#, c-format +#: src/tmpl-parser.c:211 msgid "Parser does not contain an input stream" msgstr "El analizador no contiene ningún flujo de entrada" -#: ../src/tmpl-template.c:451 -#, c-format +#: src/tmpl-template.c:454 msgid "Must parse template before expanding" msgstr "Se debe analizar la plantilla antes de expandirla" -#: ../src/tmpl-template-locator.c:105 +#: src/tmpl-template-locator.c:105 #, c-format -msgid "Failed to locate template \"%s\"" +#| msgid "Failed to locate template \"%s\"" +msgid "Failed to locate template “%s”" msgstr "Falló a buscar la plantilla «%s»" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/po/hu.po new/template-glib-3.26.0/po/hu.po --- old/template-glib-3.25.3/po/hu.po 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/po/hu.po 2017-09-11 23:29:09.000000000 +0200 @@ -2,14 +2,14 @@ # Copyright (C) 2016 Free Software Foundation, Inc. # This file is distributed under the same license as the template-glib package. # -# Balázs Úr <[email protected]>, 2016. +# Balázs Úr <[email protected]>, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: template-glib master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; -"product=template-glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-06 14:42+0000\n" -"PO-Revision-Date: 2016-03-07 00:18+0100\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"; +"builder&keywords=I18N+L10N&component=templates\n" +"POT-Creation-Date: 2017-06-27 22:39+0000\n" +"PO-Revision-Date: 2017-09-05 17:55+0200\n" "Last-Translator: Balázs Úr <[email protected]>\n" "Language-Team: Hungarian <[email protected]>\n" "Language: hu\n" @@ -19,23 +19,22 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.2\n" -#: ../src/tmpl-parser.c:199 +#: src/tmpl-parser.c:199 #, c-format msgid "%s() may only be called once" msgstr "A(z) %s() csak egyszer hívható meg" -#: ../src/tmpl-parser.c:211 -#, c-format +#: src/tmpl-parser.c:211 msgid "Parser does not contain an input stream" msgstr "A feldolgozó nem tartalmaz bemeneti adatfolyamot" -#: ../src/tmpl-template.c:451 -#, c-format +#: src/tmpl-template.c:454 msgid "Must parse template before expanding" msgstr "Fel kell dolgozni a sablont a kibővítés előtt" -#: ../src/tmpl-template-locator.c:105 +#: src/tmpl-template-locator.c:105 #, c-format -msgid "Failed to locate template \"%s\"" +#| msgid "Failed to locate template \"%s\"" +msgid "Failed to locate template “%s”" msgstr "Nem sikerült megtalálni a(z) „%s” sablont" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/po/id.po new/template-glib-3.26.0/po/id.po --- old/template-glib-3.25.3/po/id.po 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/po/id.po 2017-09-11 23:29:09.000000000 +0200 @@ -6,34 +6,32 @@ msgid "" msgstr "" "Project-Id-Version: template-glib master\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"; -"product=template-glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-04-08 19:42+0000\n" -"PO-Revision-Date: 2017-04-11 09:51+0700\n" -"Last-Translator: Andika Triwidada <[email protected]>\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"; +"builder&keywords=I18N+L10N&component=templates\n" +"POT-Creation-Date: 2017-06-05 10:48+0000\n" +"PO-Revision-Date: 2017-06-18 14:37+0700\n" +"Last-Translator: Kukuh Syafaat <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: Poedit 1.8.11\n" -#: ../src/tmpl-parser.c:199 +#: src/tmpl-parser.c:199 #, c-format msgid "%s() may only be called once" msgstr "%s() hanya boleh dipanggil sekali" -#: ../src/tmpl-parser.c:211 -#, c-format +#: src/tmpl-parser.c:211 msgid "Parser does not contain an input stream" msgstr "Pengurai tidak mengandung suatu stream masukan" -#: ../src/tmpl-template.c:454 -#, c-format +#: src/tmpl-template.c:454 msgid "Must parse template before expanding" msgstr "Mesti mengurai templat sebelum memperluas" -#: ../src/tmpl-template-locator.c:105 +#: src/tmpl-template-locator.c:105 #, c-format -msgid "Failed to locate template \"%s\"" +msgid "Failed to locate template “%s”" msgstr "Gagal menemukan templat \"%s\"" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/po/pt_BR.po new/template-glib-3.26.0/po/pt_BR.po --- old/template-glib-3.25.3/po/pt_BR.po 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/po/pt_BR.po 2017-09-11 23:29:09.000000000 +0200 @@ -1,40 +1,39 @@ # Brazilian Portuguese translation for template-glib. -# Copyright (C) 2016 template-glib's COPYRIGHT HOLDER +# Copyright (C) 2017 template-glib's COPYRIGHT HOLDER # This file is distributed under the same license as the template-glib package. -# Rafael Fontenelle <[email protected]>, 2016. -# +# Rafael Fontenelle <[email protected]>, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: template-glib master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; -"product=template-glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-05 14:49+0000\n" -"PO-Revision-Date: 2016-03-05 17:47-0200\n" -"Last-Translator: Rafael Fontenelle <[email protected]>\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"; +"builder&keywords=I18N+L10N&component=templates\n" +"POT-Creation-Date: 2017-06-05 10:48+0000\n" +"PO-Revision-Date: 2017-06-25 16:29-0200\n" +"Last-Translator: Rafael Fontenelle <[email protected]>\n" "Language-Team: Brazilian Portuguese <[email protected]>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.5\n" +"X-Generator: Virtaal 1.0.0-beta1\n" +"X-Project-Style: gnome\n" -#: ../src/tmpl-parser.c:199 +#: src/tmpl-parser.c:199 #, c-format msgid "%s() may only be called once" msgstr "%s() pode ser chamado apenas uma vez" -#: ../src/tmpl-parser.c:211 -#, c-format +#: src/tmpl-parser.c:211 msgid "Parser does not contain an input stream" msgstr "O analisador não contém um fluxo de entrada" -#: ../src/tmpl-template.c:451 -#, c-format +#: src/tmpl-template.c:454 msgid "Must parse template before expanding" msgstr "Deve-se analisar o modelo antes de expandir" -#: ../src/tmpl-template-locator.c:105 +#: src/tmpl-template-locator.c:105 #, c-format -msgid "Failed to locate template \"%s\"" -msgstr "Falha ao localizar o modelo \"%s\"" +#| msgid "Failed to locate template \"%s\"" +msgid "Failed to locate template “%s”" +msgstr "Falha ao localizar o modelo “%s”" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/po/sl.po new/template-glib-3.26.0/po/sl.po --- old/template-glib-3.25.3/po/sl.po 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/po/sl.po 2017-09-11 23:29:09.000000000 +0200 @@ -35,9 +35,9 @@ #: ../src/tmpl-template.c:454 #, c-format msgid "Must parse template before expanding" -msgstr "Predlogo je treba razčleniti pred razširjanjem" +msgstr "Pred razširjanjem je treba predlogo razčleniti" -#: ../src/tmpl-template-locator.c:105 +#: src/tmpl-template-locator.c:105 #, c-format msgid "Failed to locate template \"%s\"" msgstr "Iskanje predloge »%s« je spodletelo." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/po/sr.po new/template-glib-3.26.0/po/sr.po --- old/template-glib-3.25.3/po/sr.po 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/po/sr.po 2017-09-11 23:29:09.000000000 +0200 @@ -1,16 +1,16 @@ # Serbian translation for template-glib. -# Copyright (C) 2016 template-glib's COPYRIGHT HOLDER +# Copyright © 2016 template-glib's COPYRIGHT HOLDER # This file is distributed under the same license as the template-glib package. -# Мирослав Николић <[email protected]>, 2016. +# Мирослав Николић <[email protected]>, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: template-glib master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product"; -"=template-glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-01-12 07:43+0000\n" -"PO-Revision-Date: 2016-01-12 10:20+0200\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"; +"builder&keywords=I18N+L10N&component=templates\n" +"POT-Creation-Date: 2017-06-27 22:39+0000\n" +"PO-Revision-Date: 2017-08-12 21:45+0200\n" "Last-Translator: Мирослав Николић <[email protected]>\n" -"Language-Team: Serbian <[email protected]>\n" +"Language-Team: српски <[email protected]>\n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,22 +19,21 @@ "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -#: ../src/tmpl-parser.c:199 +#: src/tmpl-parser.c:199 #, c-format msgid "%s() may only be called once" msgstr "Функција „%s()“ може бити позвана само једном" -#: ../src/tmpl-parser.c:211 -#, c-format +#: src/tmpl-parser.c:211 msgid "Parser does not contain an input stream" msgstr "Обрађивач не садржи улазни ток" -#: ../src/tmpl-template.c:399 -#, c-format +#: src/tmpl-template.c:454 msgid "Must parse template before expanding" msgstr "Мора да обради шаблон пре ширења" -#: ../src/tmpl-template-locator.c:105 +#: src/tmpl-template-locator.c:105 #, c-format -msgid "Failed to locate template \"%s\"" +#| msgid "Failed to locate template \"%s\"" +msgid "Failed to locate template “%s”" msgstr "Нисам успео да пронађем шаблон „%s“" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/src/main.c new/template-glib-3.26.0/src/main.c --- old/template-glib-3.25.3/src/main.c 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/src/main.c 2017-09-11 23:29:09.000000000 +0200 @@ -1,19 +1,19 @@ -/* tmpl.c +/* main.c * - * Copyright (C) 2016 Christian Hergert <[email protected]> + * Copyright (C) 2015-2017 Christian Hergert <[email protected]> * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * This file is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This file is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <gio/gio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/src/meson.build new/template-glib-3.26.0/src/meson.build --- old/template-glib-3.25.3/src/meson.build 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/src/meson.build 2017-09-11 23:29:09.000000000 +0200 @@ -140,12 +140,17 @@ error('You must set pkglibdir and pkgincludedir when using as a subproject') endif +libtemplate_glib_link_args = [] +if ld_supports_version_script +libtemplate_glib_link_args += [ '-Wl,--version-script,' + join_paths(meson.current_source_dir(), 'template-glib.map') ] +endif + libtemplate_glib = library( 'template_glib-' + apiversion, libtemplate_glib_sources, link_depends: 'template-glib.map', - link_args: [ '-Wl,--version-script,' + join_paths(meson.current_source_dir(), 'template-glib.map') ], + link_args: libtemplate_glib_link_args, dependencies: libtemplate_glib_deps, soversion: soversion, version: libversion, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/src/tmpl-debug.h.in new/template-glib-3.26.0/src/tmpl-debug.h.in --- old/template-glib-3.25.3/src/tmpl-debug.h.in 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/src/tmpl-debug.h.in 2017-09-11 23:29:09.000000000 +0200 @@ -1,19 +1,19 @@ -/* ide-debug.h +/* tmpl-debug.h.in * - * Copyright (C) 2015 Christian Hergert <[email protected]> + * Copyright (C) 2015-2017 Christian Hergert <[email protected]> * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * This file is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This file is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef TMPL_DEBUG_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/src/tmpl-enums.c.in new/template-glib-3.26.0/src/tmpl-enums.c.in --- old/template-glib-3.25.3/src/tmpl-enums.c.in 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/src/tmpl-enums.c.in 2017-09-11 23:29:09.000000000 +0200 @@ -11,7 +11,7 @@ /*** END file-header ***/ /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ +/* enumerations from "@basename@" */ /*** END file-production ***/ /*** BEGIN value-header ***/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/src/tmpl-enums.h.in new/template-glib-3.26.0/src/tmpl-enums.h.in --- old/template-glib-3.25.3/src/tmpl-enums.h.in 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/src/tmpl-enums.h.in 2017-09-11 23:29:09.000000000 +0200 @@ -9,7 +9,7 @@ /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ +/* enumerations from "@basename@" */ /*** END file-production ***/ /*** BEGIN value-header ***/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/src/tmpl-expr-eval.c new/template-glib-3.26.0/src/tmpl-expr-eval.c --- old/template-glib-3.25.3/src/tmpl-expr-eval.c 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/src/tmpl-expr-eval.c 2017-09-11 23:29:09.000000000 +0200 @@ -560,7 +560,6 @@ static gchar * make_title (const gchar *str) { - g_auto(GStrv) parts = NULL; GString *ret; g_assert (str != NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/template-glib-3.25.3/src/tmpl-version.h.in new/template-glib-3.26.0/src/tmpl-version.h.in --- old/template-glib-3.25.3/src/tmpl-version.h.in 2017-06-19 05:39:07.000000000 +0200 +++ new/template-glib-3.26.0/src/tmpl-version.h.in 2017-09-11 23:29:09.000000000 +0200 @@ -2,18 +2,18 @@ * * Copyright (C) 2015-2017 Christian Hergert <[email protected]> * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * This file is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This file is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef TMPL_VERSION_H
