From ff33fce4ea9f242649562eb19af71f258997fa3a008d52daf9b596da35c18f96 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 21 Dec 2009 10:48:43 +0000 Subject: [PATCH 1/4] Accepting request 27284 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/glib2 via accept of submit request 27284 revision 2. Request was accepted with message: accept OBS-URL: https://build.opensuse.org/request/show/27284 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=65 --- glib2.changes | 5 +++++ gtk-doc.m4 | 26 ++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/glib2.changes b/glib2.changes index 604ce1d..8d0ea14 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 21 11:28:55 CET 2009 - vuntz@opensuse.org + +- Update gtk-doc.m4 from gtk-doc package. + ------------------------------------------------------------------- Mon Dec 14 20:48:33 CET 2009 - jengelh@medozas.de diff --git a/gtk-doc.m4 b/gtk-doc.m4 index 384c224..9012945 100644 --- a/gtk-doc.m4 +++ b/gtk-doc.m4 @@ -8,6 +8,12 @@ AC_DEFUN([GTK_DOC_CHECK], [ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + + dnl check for tools we added during development + AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + dnl for overriding the documentation installation directory AC_ARG_WITH([html-dir], AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, @@ -26,14 +32,30 @@ AC_DEFUN([GTK_DOC_CHECK], [PKG_CHECK_EXISTS([gtk-doc],, AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) fi AC_MSG_CHECKING([whether to build gtk-doc documentation]) AC_MSG_RESULT($enable_gtk_doc) - AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) ]) From 8f980577018c0b0c9a6e95b7eb5fcc1d7e150af9e4aa02c8605e2cbbe5445cf1 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 24 Dec 2009 15:31:12 +0000 Subject: [PATCH 2/4] Accepting request 27423 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/glib2 via accept of submit request 27423 revision 2. Request was accepted with message: accept OBS-URL: https://build.opensuse.org/request/show/27423 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=66 --- glib-2.23.0.tar.bz2 | 3 --- glib-2.23.1.tar.bz2 | 3 +++ glib2.changes | 20 ++++++++++++++++++++ glib2.spec | 6 +++--- 4 files changed, 26 insertions(+), 6 deletions(-) delete mode 100644 glib-2.23.0.tar.bz2 create mode 100644 glib-2.23.1.tar.bz2 diff --git a/glib-2.23.0.tar.bz2 b/glib-2.23.0.tar.bz2 deleted file mode 100644 index 6d3a2c6..0000000 --- a/glib-2.23.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24002573dd17bc31c099cfa37853ccb0b510f2f6cf54222c3681b9b0ed5e9288 -size 5028716 diff --git a/glib-2.23.1.tar.bz2 b/glib-2.23.1.tar.bz2 new file mode 100644 index 0000000..3c64618 --- /dev/null +++ b/glib-2.23.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5074df427a0640fb37b73cb692f233907fa2015af3be8594cd235a28ed1605a6 +size 5082222 diff --git a/glib2.changes b/glib2.changes index 8d0ea14..c41ca22 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Dec 22 13:16:55 CET 2009 - vuntz@opensuse.org + +- Update to version 2.23.1: + + GObject performance work has landed: + - Construction of simple objects is much faster + - Interface lookup is lock-free and constant-time now + - Reduced locking overhead when dealing with types + + GType now has a G_DEFINE_INTERFACE convenience macro + + GIO gained GUtf8InputStream, an input stream that performs + utf-8 validation + + GLib now has byte-swap macros for gsize and gssize + + Bugs fixed: + - bgo#603982: Stack overflow when reading file async with + filter + - bgo#557151, bgo#557100, bgo#501166, bgo#585375, bgo#587892, + bgo#603270, bgo#603476, bgo#603540, bgo#604645, bgo#604875, + bgo#320482 + + Updated translations. + ------------------------------------------------------------------- Mon Dec 21 11:28:55 CET 2009 - vuntz@opensuse.org diff --git a/glib2.spec b/glib2.spec index 9d8fe50..05b7b43 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,5 +1,5 @@ # -# spec file for package glib2 (Version 2.23.0) +# spec file for package glib2 (Version 2.23.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: glib2 %define _name glib -Version: 2.23.0 -Release: 2 +Version: 2.23.1 +Release: 1 License: LGPLv2.1+ Summary: A Library with Convenient Functions Written in C Url: http://www.gtk.org/ From f3077d29bfa695876aaec5c34e1f5312d1913c23e08436fe6e5ecc1eb2d7f476 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 29 Dec 2009 18:01:21 +0000 Subject: [PATCH 3/4] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=67 --- glib-2.23.0.tar.bz2 | 3 +++ glib-2.23.1.tar.bz2 | 3 --- glib2.changes | 25 ------------------------- glib2.spec | 6 +++--- gtk-doc.m4 | 26 ++------------------------ 5 files changed, 8 insertions(+), 55 deletions(-) create mode 100644 glib-2.23.0.tar.bz2 delete mode 100644 glib-2.23.1.tar.bz2 diff --git a/glib-2.23.0.tar.bz2 b/glib-2.23.0.tar.bz2 new file mode 100644 index 0000000..6d3a2c6 --- /dev/null +++ b/glib-2.23.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24002573dd17bc31c099cfa37853ccb0b510f2f6cf54222c3681b9b0ed5e9288 +size 5028716 diff --git a/glib-2.23.1.tar.bz2 b/glib-2.23.1.tar.bz2 deleted file mode 100644 index 3c64618..0000000 --- a/glib-2.23.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5074df427a0640fb37b73cb692f233907fa2015af3be8594cd235a28ed1605a6 -size 5082222 diff --git a/glib2.changes b/glib2.changes index c41ca22..604ce1d 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,28 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 22 13:16:55 CET 2009 - vuntz@opensuse.org - -- Update to version 2.23.1: - + GObject performance work has landed: - - Construction of simple objects is much faster - - Interface lookup is lock-free and constant-time now - - Reduced locking overhead when dealing with types - + GType now has a G_DEFINE_INTERFACE convenience macro - + GIO gained GUtf8InputStream, an input stream that performs - utf-8 validation - + GLib now has byte-swap macros for gsize and gssize - + Bugs fixed: - - bgo#603982: Stack overflow when reading file async with - filter - - bgo#557151, bgo#557100, bgo#501166, bgo#585375, bgo#587892, - bgo#603270, bgo#603476, bgo#603540, bgo#604645, bgo#604875, - bgo#320482 - + Updated translations. - -------------------------------------------------------------------- -Mon Dec 21 11:28:55 CET 2009 - vuntz@opensuse.org - -- Update gtk-doc.m4 from gtk-doc package. - ------------------------------------------------------------------- Mon Dec 14 20:48:33 CET 2009 - jengelh@medozas.de diff --git a/glib2.spec b/glib2.spec index 05b7b43..9d8fe50 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,5 +1,5 @@ # -# spec file for package glib2 (Version 2.23.1) +# spec file for package glib2 (Version 2.23.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: glib2 %define _name glib -Version: 2.23.1 -Release: 1 +Version: 2.23.0 +Release: 2 License: LGPLv2.1+ Summary: A Library with Convenient Functions Written in C Url: http://www.gtk.org/ diff --git a/gtk-doc.m4 b/gtk-doc.m4 index 9012945..384c224 100644 --- a/gtk-doc.m4 +++ b/gtk-doc.m4 @@ -8,12 +8,6 @@ AC_DEFUN([GTK_DOC_CHECK], [ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - - dnl check for tools we added during development - AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) - AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) - AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) - dnl for overriding the documentation installation directory AC_ARG_WITH([html-dir], AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, @@ -32,30 +26,14 @@ AC_DEFUN([GTK_DOC_CHECK], [PKG_CHECK_EXISTS([gtk-doc],, AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) fi AC_MSG_CHECKING([whether to build gtk-doc documentation]) AC_MSG_RESULT($enable_gtk_doc) - dnl enable/disable output formats - AC_ARG_ENABLE([gtk-doc-html], - AS_HELP_STRING([--enable-gtk-doc-html], - [build documentation in html format [[default=yes]]]),, - [enable_gtk_doc_html=yes]) - AC_ARG_ENABLE([gtk-doc-pdf], - AS_HELP_STRING([--enable-gtk-doc-pdf], - [build documentation in pdf format [[default=no]]]),, - [enable_gtk_doc_pdf=no]) - - if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no - fi - + AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) ]) From ab54596622d6cbbcab74d4141a0628f86c90cd5f7c9ae8dc0050f93ff78da899 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 29 Dec 2009 18:01:22 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/glib2 revision 77.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=ef2ddce9258185a9518f625f04956f8c --- glib-2.23.0.tar.bz2 | 3 --- glib-2.23.1.tar.bz2 | 3 +++ glib2.changes | 25 +++++++++++++++++++++++++ glib2.spec | 6 +++--- gtk-doc.m4 | 26 ++++++++++++++++++++++++-- 5 files changed, 55 insertions(+), 8 deletions(-) delete mode 100644 glib-2.23.0.tar.bz2 create mode 100644 glib-2.23.1.tar.bz2 diff --git a/glib-2.23.0.tar.bz2 b/glib-2.23.0.tar.bz2 deleted file mode 100644 index 6d3a2c6..0000000 --- a/glib-2.23.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24002573dd17bc31c099cfa37853ccb0b510f2f6cf54222c3681b9b0ed5e9288 -size 5028716 diff --git a/glib-2.23.1.tar.bz2 b/glib-2.23.1.tar.bz2 new file mode 100644 index 0000000..3c64618 --- /dev/null +++ b/glib-2.23.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5074df427a0640fb37b73cb692f233907fa2015af3be8594cd235a28ed1605a6 +size 5082222 diff --git a/glib2.changes b/glib2.changes index 604ce1d..c41ca22 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Dec 22 13:16:55 CET 2009 - vuntz@opensuse.org + +- Update to version 2.23.1: + + GObject performance work has landed: + - Construction of simple objects is much faster + - Interface lookup is lock-free and constant-time now + - Reduced locking overhead when dealing with types + + GType now has a G_DEFINE_INTERFACE convenience macro + + GIO gained GUtf8InputStream, an input stream that performs + utf-8 validation + + GLib now has byte-swap macros for gsize and gssize + + Bugs fixed: + - bgo#603982: Stack overflow when reading file async with + filter + - bgo#557151, bgo#557100, bgo#501166, bgo#585375, bgo#587892, + bgo#603270, bgo#603476, bgo#603540, bgo#604645, bgo#604875, + bgo#320482 + + Updated translations. + +------------------------------------------------------------------- +Mon Dec 21 11:28:55 CET 2009 - vuntz@opensuse.org + +- Update gtk-doc.m4 from gtk-doc package. + ------------------------------------------------------------------- Mon Dec 14 20:48:33 CET 2009 - jengelh@medozas.de diff --git a/glib2.spec b/glib2.spec index 9d8fe50..05b7b43 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,5 +1,5 @@ # -# spec file for package glib2 (Version 2.23.0) +# spec file for package glib2 (Version 2.23.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: glib2 %define _name glib -Version: 2.23.0 -Release: 2 +Version: 2.23.1 +Release: 1 License: LGPLv2.1+ Summary: A Library with Convenient Functions Written in C Url: http://www.gtk.org/ diff --git a/gtk-doc.m4 b/gtk-doc.m4 index 384c224..9012945 100644 --- a/gtk-doc.m4 +++ b/gtk-doc.m4 @@ -8,6 +8,12 @@ AC_DEFUN([GTK_DOC_CHECK], [ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + + dnl check for tools we added during development + AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + dnl for overriding the documentation installation directory AC_ARG_WITH([html-dir], AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, @@ -26,14 +32,30 @@ AC_DEFUN([GTK_DOC_CHECK], [PKG_CHECK_EXISTS([gtk-doc],, AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) fi AC_MSG_CHECKING([whether to build gtk-doc documentation]) AC_MSG_RESULT($enable_gtk_doc) - AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) ])