May 2011 - openSUSE Commits - openSUSE Mailing Lists

commit vala for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package vala for openSUSE:Factory checked in at Mon May 2 15:26:04 CEST 2011. -------- --- GNOME/vala/vala.changes 2011-01-09 16:20:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/vala/vala.changes 2011-04-04 16:21:31.000000000 +0200 @@ -1,0 +2,51 @@ +Mon Apr 4 11:18:50 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 0.12.0: + + Add get_next_char to string class. + + Many bug fixes and binding updates. +- Changes from version 0.11.7: + + Add support for async signal handlers. + + More refactoring in the code generator. + + Improvements to the .gir writer. + + Many bug fixes and binding updates. +- Changes from version 0.11.6: + + Add parse and try_parse methods to boolean and numeric types. + + Add clutter-gtk-1.0 bindings. + + Add pixmap-1 bindings. + + Many bug fixes and binding updates. +- Changes from version 0.11.5: + + Add last_index_of and last_index_of_char to string class. + + More refactoring in the code generator. + + Improvements to the .gir writer. + + Many bug fixes and binding updates. +- Changes from version 0.11.4: + + Add index_of, index_of_char, and char_count to string class. + + Many bug fixes and binding updates. +- Changes from version 0.11.3: + + Support BusName sender parameter in GDBus servers. + + More refactoring in the code generator. + + Many bug fixes and binding updates. +- Changes from version 0.11.2: + + Update libnotify bindings to 0.7.0. + + Improvements to the .gir reader. + + Bug fixes and binding updates. +- Changes from version 0.11.1: + + Require and target GLib >= 2.16. + + Guard access to out parameters to allow null arguments. + + Add support for local constants. + + Support file descriptor passing with GDBus. + + Support cached property values in GDBus clients. + + Support Cancellable parameter in GDBus clients. + + Support no-reply methods in GDBus clients and servers. + + More refactoring in the code generator. + + Many bug fixes and binding updates. +- Changes from version 0.11.0: + + Use byte indices for strings. + + Use uint8[] for binary data in bindings. + + Add support for parallel compilation. + + Improve compiler performance. + + More refactoring in the code generator. + + Many bug fixes and binding updates. +- Drop vala-bgo638902-shotwell-fix.patch: fixed upstream. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- vala-0.10.2.tar.bz2 vala-bgo638902-shotwell-fix.patch New: ---- vala-0.12.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vala.spec ++++++ --- /var/tmp/diff_new_pack.P8NeWw/_old 2011-05-02 15:23:24.000000000 +0200 +++ /var/tmp/diff_new_pack.P8NeWw/_new 2011-05-02 15:23:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package vala (Version 0.10.2) +# spec file for package vala # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,21 +18,19 @@ Name: vala -Version: 0.10.2 -Release: 2 -%define vala_version 0.10 -%define vala_libversion 0_10 +Version: 0.12.0 +Release: 1 +%define vala_version 0.12 +%define vala_libversion 0_12 # The priority defines which version of vala, in case of multiple ones are installed # is to be used by default. The rule-of-thumb for vala is to use MAJORMINOR without # decimal separator, hoping they will not get to the idea to crate a 0.100 release. -%define vala_priority 10 +%define vala_priority 12 License: LGPLv2.0 Summary: Programming language for GNOME Url: http://live.gnome.org/Vala Group: Development/Languages/Other Source0: http://www.paldo.org/vala/vala-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM vala-bgo638902-shotwell-fix.patch bgo#638902 vuntz(a)opensuse.org -- Fix to avoid a build error in shotwell 0.8.0, based on patch from git -Patch0: vala-bgo638902-shotwell-fix.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -79,7 +77,6 @@ %prep %setup -q -%patch0 -p1 %build %configure --with-pic --enable-vapigen @@ -146,6 +143,6 @@ %defattr(-,root,root,-) %{_includedir}/vala-%{vala_version}/ %{_libdir}/libvala-%{vala_version}.so -%{_libdir}/pkgconfig/vala-%{vala_version}.pc +%{_libdir}/pkgconfig/libvala-%{vala_version}.pc %changelog ++++++ vala-0.10.2.tar.bz2 -> vala-0.12.0.tar.bz2 ++++++ ++++ 497502 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgnomeprintui for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package libgnomeprintui for openSUSE:Factory checked in at Mon May 2 15:23:13 CEST 2011. -------- --- GNOME/libgnomeprintui/libgnomeprintui.changes 2010-09-28 13:27:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/libgnomeprintui/libgnomeprintui.changes 2011-02-27 14:39:13.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Feb 27 13:39:13 UTC 2011 - aj(a)suse.de + +- Change lang package Requires to Recommends since it is not + mandatory at runtime. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgnomeprintui.spec ++++++ --- /var/tmp/diff_new_pack.GCPUxa/_old 2011-05-02 15:22:42.000000000 +0200 +++ /var/tmp/diff_new_pack.GCPUxa/_new 2011-05-02 15:22:42.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libgnomeprintui (Version 2.18.6) +# spec file for package libgnomeprintui # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ %endif # Version: 2.18.6 -Release: 1 +Release: 5 Summary: User Interface Part of the GNOME Printing Library Source: %{name}-%{version}.tar.bz2 Source99: baselibs.conf @@ -37,7 +37,7 @@ Requires: libgnomeprint >= 2.10.0 Requires: libgnomecups >= 0.2.0 Requires: libgnomesu -Requires: %{name}-lang = %{version} +Recommends: %{name}-lang %description This library contains all user-interface related functions to the GNOME ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgnomeprint for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package libgnomeprint for openSUSE:Factory checked in at Mon May 2 15:22:34 CEST 2011. -------- --- GNOME/libgnomeprint/libgnomeprint.changes 2010-09-28 21:32:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/libgnomeprint/libgnomeprint.changes 2011-02-27 14:37:49.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Feb 27 13:37:49 UTC 2011 - aj(a)suse.de + +- Change lang package Requires to Recommends since it is not + mandatory at runtime. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgnomeprint.spec ++++++ --- /var/tmp/diff_new_pack.qLqgfH/_old 2011-05-02 15:22:11.000000000 +0200 +++ /var/tmp/diff_new_pack.qLqgfH/_new 2011-05-02 15:22:11.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libgnomeprint (Version 2.18.8) +# spec file for package libgnomeprint # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,7 +41,7 @@ %endif # Version: 2.18.8 -Release: 1 +Release: 5 Summary: The GNOME 2.x Printing Library Source: %{name}-%{version}.tar.bz2 Source1: libgnomeprint-icons.tar.gz @@ -50,7 +50,7 @@ Patch: libgnomeprint-suseconfig.dif Patch1: libgnomeprint.patch Patch3: libgnomeprint-pdf-invalid-path-176712.patch -Requires: %{name}-lang = %{version} +Recommends: %{name}-lang %description This package contains the GNOME 2.x printing library, which provides a ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libxklavier for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package libxklavier for openSUSE:Factory checked in at Mon May 2 15:22:04 CEST 2011. -------- --- GNOME/libxklavier/libxklavier.changes 2010-01-15 02:41:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/libxklavier/libxklavier.changes 2011-04-19 07:45:41.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Apr 19 05:44:44 UTC 2011 - ro(a)suse.de + +- Update baselibs.conf (libxklavier16 instead of libxklavier12) + +------------------------------------------------------------------- +Mon Feb 14 14:59:49 UTC 2011 - fcrozat(a)novell.com + +- Update to version 5.1: + + Expanding APIs for GNOME 3 needs: + - converting ISO codes to translatable names (it was private, + now public) + - search by pattern + + Using X11 API through pkg-config + + One race condition eliminated + + XInput2 version checking: looking for support of DevicePresence + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libxklavier-5.0.tar.bz2 New: ---- libxklavier-5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxklavier.spec ++++++ --- /var/tmp/diff_new_pack.fgRnUn/_old 2011-05-02 15:21:41.000000000 +0200 +++ /var/tmp/diff_new_pack.fgRnUn/_new 2011-05-02 15:21:41.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libxklavier (Version 5.0) +# spec file for package libxklavier # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ BuildRequires: doxygen glib2-devel gtk-doc iso-codes-devel libxml2-devel pkg-config xorg-x11-devel License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/X11 -Version: 5.0 +Version: 5.1 Release: 1 Summary: Library with X keyboard related functions Source: %{name}-%{version}.tar.bz2 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.fgRnUn/_old 2011-05-02 15:21:41.000000000 +0200 +++ /var/tmp/diff_new_pack.fgRnUn/_new 2011-05-02 15:21:41.000000000 +0200 @@ -1 +1 @@ -libxklavier12 +libxklavier16 ++++++ libxklavier-5.0.tar.bz2 -> libxklavier-5.1.tar.bz2 ++++++ ++++ 16483 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsoup for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package libsoup for openSUSE:Factory checked in at Mon May 2 15:20:52 CEST 2011. -------- --- GNOME/libsoup/libsoup.changes 2010-11-30 10:36:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/libsoup/libsoup.changes 2011-04-26 17:13:05.000000000 +0200 @@ -1,0 +2,135 @@ +Tue Apr 26 14:31:00 UTC 2011 - fcrozat(a)novell.com + +- Update to version 2.34.1: + + Two multipart forms/Content-Disposition fixes: + . UTF-8-encoded header encoding/decoding rules updated to match + RFC 5987. In particular, a UTF-8-encoded filename parameter + in Content-Disposition will now override an ASCII one. + . When not using UTF-8-encoded filenames in + Content-Disposition, always quote the filename, since some + servers erroneously fail to handle non-quoted ones. + (bgo#641280) + + Fixed several memory leaks + + Fixed decoding base64 data: URLs (bgo#646896) + + Fixed a bug in soup_uri_to_string() in which (invalid) port + numbers could be output as negative numbers (tripping up a + WebKit "sanity checking" test) (bgo#647767) + + Fixed a cache corruption bug in SoupCache (bgo#648285) + + Fixed a crash in SoupSessionSync when using + soup_session_abort(). + +------------------------------------------------------------------- +Tue Apr 5 11:46:27 UTC 2011 - fcrozat(a)novell.com + +- Update to version 2.34.0: + + Fixed the GMainContext handling of the new + SoupProxyResolverDefault (which among other things fixes + gstreamer usage inside epiphany). bgo#646201 + + Tweaked the introspection Makefile rules to fix a problem + building on Debian/Ubuntu. bgo#645505 + + Belated bumped the shared library versioning to reflect the + API additions since 2.32.0 + +------------------------------------------------------------------- +Tue Mar 22 13:15:30 UTC 2011 - fcrozat(a)novell.com + +- Update to version 2.33.92: + + LIBSOUP NO LONGER DEPENDS ON GCONF OR LIBPROXY. (see below). + + Added SoupProxyResolverDefault, which uses uses gio's + GProxyResolver to resolve proxies [bgo#642982] + Despite the "default" in the name, it is not used by + default, for compatibility reasons, but it is available in + plain libsoup, not libsoup-gnome. (Of course, it depends on + having glib-networking installed.) + + Updated SoupProxyResolverGNOME to be based on + SoupProxyResolverDefault, but explicitly requesting the + "gnome" GProxyResolver if it is available [bgo#625898], and + removed the old code that used GConf and libproxy directly. + + Added soup_server_disconnect(), to explicitly disconnect a + SoupServer, since it is not possible to g_object_unref() it + from memory-managed language bindings. [bgo#638576] + + SoupDate now parses month names case-insensitively [bgo#644048] + + Avoid a g_return_if_fail() when using + SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY with non-http URIs + (file:, data:, etc). [bgo#643226] + + SoupCookieJar now catches overflows when parsing very + distant dates [bgo#643462] + + Fixed a buggy interaction between request body streaming and + restarted requests. Added some new tests + to tests/chunk-test.c to make sure that a specific + (unsupported!) way of using those methods would not get + broken in the future. + + Fixed soup_socket_get_remote_address(), which had been + broken since 2.33.4 (and which in turn caused + soup_client_context_get_address/_get_host to be broken). + [bgo#645227] +- Drop gconf2-devel and libproxy-devel BuildRequires. + +------------------------------------------------------------------- +Tue Feb 22 18:09:27 UTC 2011 - fcrozat(a)novell.com + +- Update to version 2.33.90: + + glib-networking is a compile and runtime dependency now. + + bgo#642075: fixed a bug in talking to servers with virtual + hosts with Unicode names (IDNs). + + bgo#640414: added a "Connection: Keep-Alive" header when + talking to HTTP/1.0 hosts, to improve performance. + + bgo#642028: changed SoupCache to not cache + multipart/x-mixed-replace content. +- Changes from version 2.33.6: + + bgo#639768: made SoupSessionAsync do idle-connection cleanup + more sanely, resulting in faster load times for pages with lots + of subresources. + + bgo#639783: fixed soup_form_decode()'s behavior (and by + extension, SoupServer query string handling) with datasets that + contain multiple values for the same key, and added a test + case. + + bgo#640556: fixed warnings pointed out by gcc 4.6, including a + bug in SoupCache that would cause unnecessary revalidations. + + bgo#641022: belated copied a fix from the WebKit copy of + soup-cache.c into ours, and fixed a bug in the local copy of + soup-request-data.c, in preparation for making WebKit use + the libsoup versions. +- Changes from version 2.33.5: + + bgo#637741: fixed certain cases of + soup_session_cancel_message() with SoupSessionSync that could + previously cause warnings or crashes. +- Changes from version 2.33.4: + + SoupSocket now uses GSocketConnection and GTlsConnection + internally rather than making socket calls directly and + using GIOStream, and TLS is handled via glib's APIs rather + than using gnutls directly. + + The gzip Content-Encoding handler is now implemented using + GZlibDecompressor + + As a result of the above two changes, libsoup no longer + directly depends on gnutls, libgcrypt, or zlib, though it + still indirectly depends on zlib via glib and libxml2. Also, + although libsoup does not depend on glib-networking as a + build-time dependency, some "make check" tests will be + skipped if it is not installed. + + bgo#523100: the SoupRequest/SoupCache code from WebKit has + been imported, but it is not yet recommended for general use, + and is not necessarily API stable. + + Added SoupMessage:tls-certificate and SoupMessage:tls-errors, + which give more information about the certificate used to + authenticate a TLS connection. + + It is now possible to disable Basic or Digest auth in a + session by using soup_session_remove_feature_by_type() with + SOUP_TYPE_AUTH_BASIC or SOUP_TYPE_AUTH_DIGEST. Likewise, the + right way to enable NTLM support now is to call + soup_session_add_feature_by_type() with SOUP_TYPE_AUTH_NTLM; + SOUP_SESSION_USE_NTLM is now deprecated. + + bgo#603825: allow setting cookies on file:// URIs, since other + browsers do, and WebKit has a test for it. + + bgo#635395: .gir/.typelib files now include C header/library + information (needed by vala and some other bindings) + + Added annotations on soup_message_headers_get_content_type() + and SoupHTTPVersion + + bgo#636741: fixed a Set-Cookie processing leak. +- Add glib-networking BuildRequires, and explicit Requires in + libsoup-2_4-1 since we need the gio module for TLS support. +- Remove now unneeded gnutls-devel BuildRequires. +- Drop libsoup-gnutls-allow-tls.patch: the TLS handling is now done + in glib-networking. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libsoup-2.32.2.tar.bz2 libsoup-gnutls-allow-tls.patch New: ---- libsoup-2.34.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsoup.spec ++++++ --- /var/tmp/diff_new_pack.Mi3Voe/_old 2011-05-02 15:20:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Mi3Voe/_new 2011-05-02 15:20:00.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libsoup (Version 2.32.2) +# spec file for package libsoup # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,22 +20,18 @@ Name: libsoup Summary: HTTP client/server library for GNOME -Version: 2.32.2 +Version: 2.34.1 Release: 1 License: LGPLv2.1+ Group: Development/Libraries/GNOME Url: http://www.gnome.org Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/libsoup/2.2/%{name}-%{version}… Source99: baselibs.conf -# PATCH-FIX-OPENSUSE libsoup-gnutls-allow-tls.patch bnc#634040 vuntz(a)opensuse.org -- Allow TLS usage instead of being SSL 3.0-only. Upstream does not want this, and rewriting a lot of code is needed to fix this correctly. However, the openSUSE security team wants TLS to be used if possible. This might lead to some websites being not accessible with libsoup. -Patch0: libsoup-gnutls-allow-tls.patch -BuildRequires: gconf2-devel BuildRequires: glib2-devel -BuildRequires: gnutls-devel +BuildRequires: glib-networking BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: libgnome-keyring-devel -BuildRequires: libproxy-devel BuildRequires: libxml2-devel BuildRequires: sqlite3-devel # We do not need these dependencies needed only for tests. @@ -65,6 +61,7 @@ License: LGPLv2.1+ Summary: HTTP client/server library for GNOME Group: Development/Libraries/GNOME +Requires: glib-networking >= 2.27.90 Provides: %{name} = %{version} Obsoletes: %{name} < %{version} # bug437293 @@ -114,7 +111,6 @@ %prep %setup -q -%patch0 -p1 %build %configure\ ++++++ libsoup-2.32.2.tar.bz2 -> libsoup-2.34.1.tar.bz2 ++++++ ++++ 22402 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libnotify for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package libnotify for openSUSE:Factory checked in at Mon May 2 15:18:19 CEST 2011. -------- --- GNOME/libnotify/libnotify.changes 2010-10-04 12:19:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/libnotify/libnotify.changes 2011-03-22 14:05:52.000000000 +0100 @@ -1,0 +2,47 @@ +Tue Mar 22 13:03:41 UTC 2011 - fcrozat(a)novell.com + +- Update to version 0.7.2: + + Add a way to change the application name + + Mark image_path as deprecated + + Allow properties to be set in any order + +------------------------------------------------------------------- +Mon Feb 7 14:14:22 UTC 2011 - fcrozat(a)novell.com + +- Update to version 0.7.1: + + Don't export private symbols + + Introspection support and annotations + + Documentation cleanups and fixes + + Ref the pixbuf passed to set_image_from_pixbuf + + Add tests for new capabilities and hints + + Update spec to mention "persistence" and "action-icons" server + capability and "action-icons", "transient" and "resident" + hints. + + Bump spec version to 1.2 +- Add gobject-introspection-devel BuildRequires to build + introspection. +- Add support for source service checkout, with %BUILD_FROM_VCS: + + Add gnome-common, gtk-doc BuildRequires. + + Add call to ./autogen.sh. + + Enforce gtk-doc html generation by passing --enable-gtk-doc to + configure. +- Change devel package group from System/Libraries to + Development/Libraries/X11, to fix rpmlint warning. + +------------------------------------------------------------------- +Fri Dec 17 10:37:09 CET 2010 - vuntz(a)opensuse.org + +- Update to version 0.7.0: + + Remove the ability to attach notifications to widgets or + positions + + Add a test for the persistence server capability + + Port to use GBus instead of dbus-glib + + Add a macro to get library version number + + Remove GTK+ dependency from library + + Port tests to GTK+ 3 +- Remove pkgconfig(dbus-1), pkgconfig(dbus-glib-1), + pkgconfig(gtk+-2.0) BuildRequires. +- Add explicit pkgconfig(gdk-pixbuf-2.0) BuildRequires. +- Rename libnotify1 to libnotify4, following the soversion change. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libnotify-0.6.0.tar.bz2 New: ---- libnotify-0.7.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnotify.spec ++++++ --- /var/tmp/diff_new_pack.SFP42i/_old 2011-05-02 15:16:39.000000000 +0200 +++ /var/tmp/diff_new_pack.SFP42i/_new 2011-05-02 15:16:39.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libnotify (Version 0.6.0) +# spec file for package libnotify # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,15 @@ Name: libnotify -BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: gobject-introspection-devel +BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) -# libnotify works with both gtk+ 2 and gtk+ 3, and we need both at build time -BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) -Version: 0.6.0 +%if 0%{?BUILD_FROM_VCS} +BuildRequires: gnome-common +BuildRequires: gtk-doc +%endif +Version: 0.7.2 Release: 1 Url: http://www.galago-project.org/ Group: System/Libraries @@ -38,13 +40,13 @@ %description D-BUS notifications library. -%package -n libnotify1 +%package -n libnotify4 License: GPLv2+ ; LGPLv2.1+ Group: System/Libraries Summary: Notifications Library Recommends: notification-daemon -%description -n libnotify1 +%description -n libnotify4 D-BUS notifications library. %package tools @@ -61,9 +63,9 @@ %package devel License: LGPLv2.1+ -Group: System/Libraries +Group: Development/Libraries/X11 Summary: Notifications Library -Requires: libnotify1 = %{version} +Requires: libnotify4 = %{version} Provides: libnotify-doc = %{version} Obsoletes: libnotify-doc < %{version} @@ -72,9 +74,15 @@ %prep %setup -q +%if 0%{?BUILD_FROM_VCS} +[ -x ./autogens.sh ] && NOCONFIGURE=1 ./autogen.sh +%endif %build %configure\ +%if 0%{?BUILD_FROM_VCS} + --enable-gtk-doc \ +%endif --disable-static make %{?jobs:-j%jobs} @@ -85,15 +93,16 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -n libnotify1 -p /sbin/ldconfig +%post -n libnotify4 -p /sbin/ldconfig -%postun -n libnotify1 -p /sbin/ldconfig +%postun -n libnotify4 -p /sbin/ldconfig -%files -n libnotify1 +%files -n libnotify4 %defattr (-, root, root) # README is empty %doc AUTHORS COPYING ChangeLog NEWS %{_libdir}/*.so.* +%{_libdir}/girepository-1.0/Notify-0.7.typelib %files tools %defattr (-, root, root) @@ -104,6 +113,7 @@ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/* +%{_datadir}/gir-1.0/*.gir # Own these repositories to not depend on gtk-doc while building: %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.SFP42i/_old 2011-05-02 15:16:39.000000000 +0200 +++ /var/tmp/diff_new_pack.SFP42i/_new 2011-05-02 15:16:39.000000000 +0200 @@ -1,4 +1,4 @@ -libnotify1 +libnotify4 arch ppc package libnotify-devel requires -libnotify-<targettype> - requires "libnotify1-<targettype> = <version>" + requires "libnotify4-<targettype> = <version>" ++++++ libnotify-0.6.0.tar.bz2 -> libnotify-0.7.2.tar.bz2 ++++++ ++++ 25253 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libcanberra for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at Mon May 2 15:16:00 CEST 2011. -------- --- GNOME/libcanberra/libcanberra.changes 2010-10-05 10:28:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/libcanberra/libcanberra.changes 2011-04-21 11:34:16.000000000 +0200 @@ -1,0 +2,33 @@ +Mon Mar 7 15:34:08 UTC 2011 - fcrozat(a)novell.com + +- Fix directory ownership of + %{_libdir}/gnome-settings-daemon-3.0/gtk-modules in + gtk-module-common. +- Remove --disable-rpath configure option: it's obsolete. + +------------------------------------------------------------------- +Wed Mar 2 16:06:54 CET 2011 - fcrozat(a)novell.com + +- Update to version 0.28: + + enable gtk module by default in gnome3 + + update login autostart files for gnome3 +- Stop making libcanberra-gtk-module-common noarch as there's a + file in %{_libdir}. + +------------------------------------------------------------------- +Fri Feb 18 12:28:26 UTC 2011 - fcrozat(a)novell.com + +- Update to version 0.27: + + add utility to play boot up sound + + systemd: add unit for bootup and shutdown sounds + + cache: don't use $HOME when it is not set + + gtk3: skip gtk_quit_add() for now +- Remove libcanberra-gtkquit.patch: fixed upstream + +------------------------------------------------------------------- +Tue Feb 15 15:47:54 UTC 2011 - fcrozat(a)novell.com + +- Enable gtk+ 3 build by setting build_gtk3 to 1. +- Add libcanberra-gtkquit.patch: do not use removed GTK+ 3 API. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libcanberra-0.26.tar.bz2 New: ---- libcanberra-0.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcanberra.spec ++++++ --- /var/tmp/diff_new_pack.q0PO9W/_old 2011-05-02 15:14:45.000000000 +0200 +++ /var/tmp/diff_new_pack.q0PO9W/_new 2011-05-02 15:14:45.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libcanberra (Version 0.26) +# spec file for package libcanberra # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,10 @@ # -%define build_gtk3 0 +%define build_gtk3 1 Name: libcanberra -Version: 0.26 +Version: 0.28 Release: 1 License: LGPLv2.0+ Summary: Portable sound event library @@ -81,7 +81,7 @@ %if %build_gtk3 %package gtk3-0 - +License: LGPLv2.0+ Summary: Portable sound event library -- GTK+ 3 Library Group: System/Libraries @@ -104,7 +104,6 @@ %if %build_gtk3 Recommends: %{name}-gtk3-module %endif -BuildArch: noarch %gconf_schemas_prereq %description gtk-module-common @@ -135,8 +134,7 @@ %if %build_gtk3 %package gtk3-module - - +License: LGPLv2.0+ Summary: Portable sound event library -- GTK+ 3 Module Group: System/Libraries Requires: %{name}-gtk-module-common = %{version} @@ -193,7 +191,7 @@ %setup -q %build -%configure --with-pic --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso +%configure --with-pic --disable-static --enable-pulse --enable-alsa --enable-null --with-builtin=dso V=1 %__make %{?jobs:-j%jobs} %install @@ -257,6 +255,9 @@ %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d %{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh +%dir %{_libdir}/gnome-settings-daemon-3.0 +%dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules +%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop %files gtk2-module %defattr(-, root, root) ++++++ libcanberra-0.26.tar.bz2 -> libcanberra-0.28.tar.bz2 ++++++ ++++ 23310 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtk3 for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package gtk3 for openSUSE:Factory checked in at Mon May 2 15:14:31 CEST 2011. -------- --- GNOME/gtk3/gtk3.changes 2011-02-13 22:25:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/gtk3/gtk3.changes 2011-04-26 15:11:45.000000000 +0200 @@ -1,0 +2,104 @@ +Tue Apr 26 12:52:49 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.9: + + Fix some interference between XI2 and input methods, XEmbed and + user-time tracking. + + Theming improvements + - Make it possible to give combo boxes, buttons, entries a + uniform height. + + GtkGrid now does RTL flipping like other containers. + + Updated translations. + +------------------------------------------------------------------- +Mon Apr 4 09:33:53 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.8: + + The size negotiation optimizations turned out to have + problematic side effects in some applications, and have been + reverted for now + + Fix prelight of selected row expanders + + Bugs fixed: bgo#645341, bgo#646446, bgo#646462, bgo#646498. + + Updated translations +- Changes from version 3.0.7: + + Performance improvements for theming and size allocation + + Thread-safety fixes in file chooser and app chooser code + + GtkStatusIcon can now receive icon size hints from the tray + it is embedded in + + RTL fixes for GtkGrid and GtkWidget::halign + + Bugs fixed: bgo#639584, bgo#642918, bgo#645232. + +------------------------------------------------------------------- +Mon Mar 28 11:26:55 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.6: + + Export dark themes for the window manager. + + Make selectable labels work again. + + Updated translations. + +------------------------------------------------------------------- +Wed Mar 23 21:55:46 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.5: + + reverts a problematic change in 3.0.4 which caused application + font settings to be ignored. +- Changes from version 3.0.4: + + New style classes for 'inline' toolbars and sidebars have been + added. + + Theming fixes and enhancement in many widgets, including + GtkRange, GtkFileChooser, GtkNotebook, GtkTreeview and + GtkRadioButton. + + Bugs fixed: bgo#640692, bgo#642712, bgo#644836, bgo#644975, + bgo#644976, bgo#645057, bgo#645134, bgo#645172, bgo#645234, + bgo#645235, bgo#645405, bgo#635254. + + Updated translations. +- Changes from version 3.0.3: + + Support for the GDK_NATIVE_WINDOWS environment variable has + been removed + + Bugs fixed: bgo#642604, bgo#643416, bgo#644119, bgo#644248, + bgo#644276, bgo#644348, bgo#644353, bgo#644355, bgo#644570. + + Updated translations. + +------------------------------------------------------------------- +Mon Mar 7 15:41:33 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.2: + + GtkSettings have been made multi-backend-safe + + Many improvements to themability and the default theme: + - GtkScale slider theming can adjust to scale marks, using + style classes. + - A new style class for 'primary' toolbars + - Widget style classes can now be specified in GtkBuilder + files. + - Improved scrollbar drawing + - Improved combobox drawing + - Improved spinbutton drawing + - Improved switch drawing + - Improved checkbutton drawing + - Improved menu drawing + - Improved notebook tab drawing + + Bugs fixed: bgo#643041, bgo#643131, bgo#643170, bgo#643216, + bgo#643321, bgo#643347, bgo#643370, bgo#643440, bgo#643496, + bgo#643543, bgo#643584, bgo#643630, bgo#643685, bgo#643911, + bgo#643912, bgo#643925, bgo#643967, bgo#644089. + +------------------------------------------------------------------- +Tue Feb 22 09:25:22 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.1: + + A autoconf macro, GTK_CHECK_BACKEND, has been added + to allow easy checking for certain gdk backends + + A number of memory leaks and segfaults involving accessibility + have been fixed + + Bugs fixed: bgo#586201, bgo#599907, bgo#626730, bgo#630971, + bgo#633291, bgo#642213, bgo#642263, bgo#642541, bgo#642677, + bgo#642681, bgo#642751, bgo#642771, bgo#642772, bgo#642778, + bgo#642782, bgo#642791. + + Updated translations. + +------------------------------------------------------------------- +Sat Feb 19 10:42:29 CET 2011 - vuntz(a)opensuse.org + +- Remove update-alternatives Requires in devel subpackage, since we + don't use this mechanism anymore there. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gtk+-3.0.0.tar.bz2 New: ---- gtk+-3.0.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk3.spec ++++++ --- /var/tmp/diff_new_pack.JssSSy/_old 2011-05-02 15:13:59.000000000 +0200 +++ /var/tmp/diff_new_pack.JssSSy/_new 2011-05-02 15:13:59.000000000 +0200 @@ -22,7 +22,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.0.0 +Version: 3.0.9 Release: 1 License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 3) @@ -258,8 +258,6 @@ Summary: The GTK+ toolkit library (version 3) -- Development Files Group: Development/Libraries/X11 Requires: libgtk-3-0 = %{version} -Requires(post): update-alternatives -Requires(postun): update-alternatives %description devel GTK+ is a multi-platform toolkit for creating graphical user interfaces. ++++++ gtk+-3.0.0.tar.bz2 -> gtk+-3.0.9.tar.bz2 ++++++ GNOME/gtk3/gtk+-3.0.0.tar.bz2 /mounts/work_src_done/STABLE/gtk3/gtk+-3.0.9.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libxml++ for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package libxml++ for openSUSE:Factory checked in at Mon May 2 15:13:36 CEST 2011. -------- --- GNOME/libxml++/libxml++.changes 2010-10-15 09:26:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/libxml++/libxml++.changes 2011-04-27 00:00:13.000000000 +0200 @@ -1,0 +2,23 @@ +Tue Apr 26 23:55:01 CEST 2011 - vuntz(a)opensuse.org + +- Update to version 2.34.1: + + Do not require mm-common during the tarball build. +- Changes from version 2.34.0: + + Build fix. +- Changes from version 2.33.1: + + Node::remove_child(): Fix a memory management problem + introduced in 2.33.1. + + Document::do_write_to_stream(), Schema::set_document(): Check + the results from xmlSchemaNewDocParserCtxt() and + xmlSaveFormatFileTo() (bgo#635846) +- Changes from version 2.33.1: + + (Hopefully) allow separate and multi-threaded libxml2 usage by + not using the global xmlRegisterNodeDefault() and + xmlDeregisterNodeDefault() callbacks. + + Do not call xmlCleanupParser() when the library is unloaded, + because it is brutal and can break other parts of applications + that try to use libxml separately. + + Minor code improvement. + + Build: Build the examples by default. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libxml++-2.32.0.tar.bz2 New: ---- libxml++-2.34.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxml++.spec ++++++ --- /var/tmp/diff_new_pack.lF6RLI/_old 2011-05-02 15:11:45.000000000 +0200 +++ /var/tmp/diff_new_pack.lF6RLI/_new 2011-05-02 15:11:45.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libxml++ (Version 2.32.0) +# spec file for package libxml++ # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ BuildRequires: libxml2-devel License: LGPLv2.1+ Group: Development/Libraries/C and C++ -Version: 2.32.0 +Version: 2.34.1 Release: 1 Summary: C++ Interface for XML Files Source: %{name}-%{version}.tar.bz2 ++++++ libxml++-2.32.0.tar.bz2 -> libxml++-2.34.1.tar.bz2 ++++++ ++++ 21007 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit librsvg for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package librsvg for openSUSE:Factory checked in at Mon May 2 15:11:33 CEST 2011. -------- --- GNOME/librsvg/librsvg.changes 2010-11-17 16:10:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/librsvg/librsvg.changes 2011-04-21 10:18:40.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 4 12:54:31 UTC 2011 - fcrozat(a)novell.com + +- Update to version 2.34.0: + + Allow building rsvg-view with gtk 3 + + Bugs fixed: bgo#629392, bgo#626802, bgo#641586, bgo#640336, + bgo#635214, fdo#30071, bgo#629412, bgo#630714. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- librsvg-2.32.1.tar.bz2 New: ---- librsvg-2.34.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librsvg.spec ++++++ --- /var/tmp/diff_new_pack.V40DsL/_old 2011-05-02 15:05:06.000000000 +0200 +++ /var/tmp/diff_new_pack.V40DsL/_new 2011-05-02 15:05:06.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package librsvg (Version 2.32.1) +# spec file for package librsvg # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define build_gtk3_support 0 Name: librsvg -Version: 2.32.1 +Version: 2.34.0 Release: 1 License: GPLv2+ Summary: A Library for Rendering SVG Data ++++++ librsvg-2.32.1.tar.bz2 -> librsvg-2.34.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/Makefile.am new/librsvg-2.34.0/Makefile.am --- old/librsvg-2.32.1/Makefile.am 2010-11-13 11:39:46.000000000 +0100 +++ new/librsvg-2.34.0/Makefile.am 2011-04-03 19:46:55.000000000 +0200 @@ -1,4 +1,12 @@ -SUBDIRS = . gdk-pixbuf-loader gtk-engine data tests tools doc +SUBDIRS = . gdk-pixbuf-loader data tests tools doc + +ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} + +if ENABLE_GTK_ENGINE +if HAVE_GTK_2 +SUBDIRS += gtk-engine +endif +endif lib_LTLIBRARIES = librsvg-@RSVG_API_MAJOR_VERSION@.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/Makefile.in new/librsvg-2.34.0/Makefile.in --- old/librsvg-2.32.1/Makefile.in 2010-11-13 11:52:21.000000000 +0100 +++ new/librsvg-2.34.0/Makefile.in 2011-04-03 19:59:50.000000000 +0200 @@ -38,9 +38,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@am__append_1 = gtk-engine bin_PROGRAMS = rsvg-convert$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) -@HAVE_GTK_2_TRUE@am__append_1 = rsvg-view -@HAVE_GTK_3_TRUE@am__append_2 = rsvg-view-3 +@HAVE_GTK_2_TRUE@am__append_2 = rsvg-view +@HAVE_GTK_3_TRUE@am__append_3 = rsvg-view-3 subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(librsvginc_HEADERS) $(srcdir)/Makefile.am \ @@ -158,7 +159,7 @@ $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) rsvg_view_3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(rsvg_view_3_CFLAGS) \ $(CFLAGS) $(rsvg_view_3_LDFLAGS) $(LDFLAGS) -o $@ @@ -214,7 +215,7 @@ distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = . gdk-pixbuf-loader data tests tools doc gtk-engine DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -292,6 +293,8 @@ GTK2_CFLAGS = @GTK2_CFLAGS@ GTK2_LIBS = @GTK2_LIBS@ GTK3_BINARY_VERSION = @GTK3_BINARY_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ @@ -408,7 +411,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = . gdk-pixbuf-loader gtk-engine data tests tools doc +SUBDIRS = . gdk-pixbuf-loader data tests tools doc $(am__append_1) +ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} lib_LTLIBRARIES = librsvg-@RSVG_API_MAJOR_VERSION@.la @OS_WIN32_FALSE@libm = -lm headers = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/NEWS new/librsvg-2.34.0/NEWS --- old/librsvg-2.32.1/NEWS 2010-11-13 11:49:38.000000000 +0100 +++ new/librsvg-2.34.0/NEWS 2011-04-03 19:59:36.000000000 +0200 @@ -1,9 +1,18 @@ -Version 2.32.1 +Version 2.34.0 + +- Allow building rsvg-view with gtk 3 -- Make sure the surfaces own their pixels - Fixes https://bugs.freedesktop.org/show_bug.cgi?id=30071 -- Remove stray comma from enum (#630714) -- Dist testcase input file (#629412) +Bugs fixed: + 629392 - stroke-dasharray is inherited by sibling texts + 626802 - NULL-ptr crash in g_str_equal in rsvg-styles.c + 641586 - configure should honour aclocal flags ACLOCAL_FLAGS + 640336 - Typo in rsvg.1 + 635214 - svgz never supported by pixbuf loader + FDO 30071 - crash when rendering this svg with librsvg to a pdf or ps or recording surface + 629412 - Missing test files on librsvg-2.31.0 + 630714 - fix stray comma + +Version 2.32.1 Version 2.32.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/configure new/librsvg-2.34.0/configure --- old/librsvg-2.32.1/configure 2010-11-13 11:52:19.000000000 +0100 +++ new/librsvg-2.34.0/configure 2011-04-03 19:59:48.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for RSVG 2.32.1. +# Generated by GNU Autoconf 2.65 for RSVG 2.34.0. # # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=librsvg>. # @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='RSVG' PACKAGE_TARNAME='librsvg' -PACKAGE_VERSION='2.32.1' -PACKAGE_STRING='RSVG 2.32.1' +PACKAGE_VERSION='2.34.0' +PACKAGE_STRING='RSVG 2.34.0' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=librsvg' PACKAGE_URL='' @@ -785,6 +785,8 @@ ENABLE_GTK_ENGINE_TRUE GTK3_BINARY_VERSION GTK2_BINARY_VERSION +GTK3_LIBS +GTK3_CFLAGS GTK2_LIBS GTK2_CFLAGS LIBRSVG_HAVE_CSS @@ -969,6 +971,8 @@ LIBCROCO_LIBS GTK2_CFLAGS GTK2_LIBS +GTK3_CFLAGS +GTK3_LIBS GDK_PIXBUF_CFLAGS GDK_PIXBUF_LIBS' @@ -1512,7 +1516,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures RSVG 2.32.1 to adapt to many kinds of systems. +\`configure' configures RSVG 2.34.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1582,7 +1586,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of RSVG 2.32.1:";; + short | recursive ) echo "Configuration of RSVG 2.34.0:";; esac cat <<\_ACEOF @@ -1646,6 +1650,8 @@ linker flags for LIBCROCO, overriding pkg-config GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config GTK2_LIBS linker flags for GTK2, overriding pkg-config + GTK3_CFLAGS C compiler flags for GTK3, overriding pkg-config + GTK3_LIBS linker flags for GTK3, overriding pkg-config GDK_PIXBUF_CFLAGS C compiler flags for GDK_PIXBUF, overriding pkg-config GDK_PIXBUF_LIBS @@ -1717,7 +1723,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -RSVG configure 2.32.1 +RSVG configure 2.34.0 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2088,7 +2094,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by RSVG $as_me 2.32.1, which was +It was created by RSVG $as_me 2.34.0, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2901,7 +2907,7 @@ # Define the identity of the package. PACKAGE='librsvg' - VERSION='2.32.1' + VERSION='2.34.0' cat >>confdefs.h <<_ACEOF @@ -2998,13 +3004,13 @@ # =========================================================================== -RSVG_LT_VERSION_INFO=34:1:32 +RSVG_LT_VERSION_INFO=36:0:34 LIBRSVG_MAJOR_VERSION=2 -LIBRSVG_MINOR_VERSION=32 +LIBRSVG_MINOR_VERSION=34 -LIBRSVG_MICRO_VERSION=1 +LIBRSVG_MICRO_VERSION=0 @@ -5885,13 +5891,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5888: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5894: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5891: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5897: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5894: output\"" >&5) + (eval echo "\"\$as_me:5900: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7082,7 +7088,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7085 "configure"' > conftest.$ac_ext + echo '#line 7091 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8469,11 +8475,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8472: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8478: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8476: \$? = $ac_status" >&5 + echo "$as_me:8482: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8808,11 +8814,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8811: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8817: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8815: \$? = $ac_status" >&5 + echo "$as_me:8821: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8913,11 +8919,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8916: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8922: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8920: \$? = $ac_status" >&5 + echo "$as_me:8926: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8968,11 +8974,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8971: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8977: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8975: \$? = $ac_status" >&5 + echo "$as_me:8981: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11338,7 +11344,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11341 "configure" +#line 11347 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11434,7 +11440,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11437 "configure" +#line 11443 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12933,9 +12939,79 @@ have_gtk_2=yes fi +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK3" >&5 +$as_echo_n "checking for GTK3... " >&6; } + +if test -n "$GTK3_CFLAGS"; then + pkg_cv_GTK3_CFLAGS="$GTK3_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTK3_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTK3_LIBS"; then + pkg_cv_GTK3_LIBS="$GTK3_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTK3_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTK3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK3_REQUIRED" 2>&1` + else + GTK3_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK3_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTK3_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_gtk_3=no +elif test $pkg_failed = untried; then + have_gtk_3=no +else + GTK3_CFLAGS=$pkg_cv_GTK3_CFLAGS + GTK3_LIBS=$pkg_cv_GTK3_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_gtk_3=yes +fi + if test "$have_gtk_2" = "yes"; then GTK2_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`" fi + if test "$have_gtk_3" = "yes"; then + GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" + fi fi @@ -14054,7 +14130,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by RSVG $as_me 2.32.1, which was +This file was extended by RSVG $as_me 2.34.0, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14120,7 +14196,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -RSVG config.status 2.32.1 +RSVG config.status 2.34.0 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/configure.in new/librsvg-2.34.0/configure.in --- old/librsvg-2.32.1/configure.in 2010-11-13 11:49:38.000000000 +0100 +++ new/librsvg-2.34.0/configure.in 2011-04-03 19:47:18.000000000 +0200 @@ -1,6 +1,6 @@ m4_define([rsvg_major_version],[2]) -m4_define([rsvg_minor_version],[32]) -m4_define([rsvg_micro_version],[1]) +m4_define([rsvg_minor_version],[34]) +m4_define([rsvg_micro_version],[0]) m4_define([rsvg_extra_version],[]) m4_define([rsvg_version],[rsvg_major_version.rsvg_minor_version.rsvg_micro_version()rsvg_extra_version]) m4_define([rsvg_lt_version_info],m4_eval(rsvg_major_version + rsvg_minor_version):rsvg_micro_version:rsvg_minor_version) @@ -242,10 +242,14 @@ if test "x$enable_gtk_theme" = "xyes" -o "x$enable_pixbuf_loader" = "xyes"; then PKG_CHECK_MODULES([GTK2],[gtk+-2.0 >= $GTK2_REQUIRED],[have_gtk_2=yes],[have_gtk_2=no]) + PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no]) if test "$have_gtk_2" = "yes"; then GTK2_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`" fi + if test "$have_gtk_3" = "yes"; then + GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" + fi fi AC_SUBST([GTK2_BINARY_VERSION]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/data/Makefile.in new/librsvg-2.34.0/data/Makefile.in --- old/librsvg-2.32.1/data/Makefile.in 2010-11-13 11:52:19.000000000 +0100 +++ new/librsvg-2.34.0/data/Makefile.in 2011-04-03 19:59:48.000000000 +0200 @@ -117,6 +117,8 @@ GTK2_CFLAGS = @GTK2_CFLAGS@ GTK2_LIBS = @GTK2_LIBS@ GTK3_BINARY_VERSION = @GTK3_BINARY_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/doc/Makefile.in new/librsvg-2.34.0/doc/Makefile.in --- old/librsvg-2.32.1/doc/Makefile.in 2010-11-13 11:52:20.000000000 +0100 +++ new/librsvg-2.34.0/doc/Makefile.in 2011-04-03 19:59:48.000000000 +0200 @@ -100,6 +100,8 @@ GTK2_CFLAGS = @GTK2_CFLAGS@ GTK2_LIBS = @GTK2_LIBS@ GTK3_BINARY_VERSION = @GTK3_BINARY_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/doc/html/RsvgHandle.html new/librsvg-2.34.0/doc/html/RsvgHandle.html --- old/librsvg-2.32.1/doc/html/RsvgHandle.html 2010-11-13 11:52:57.000000000 +0100 +++ new/librsvg-2.34.0/doc/html/RsvgHandle.html 2011-04-03 20:03:02.000000000 +0200 @@ -46,9 +46,9 @@ <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> <a class="link" href="RsvgHandle.html#rsvg-error-quark" title="rsvg_error_quark ()">rsvg_error_quark</a> (<em class="parameter"><code><span class="type">void</span></code></em>); <a class="link" href="RsvgHandle.html#RsvgHandle-struct" title="RsvgHandle">RsvgHandle</a>; typedef <a class="link" href="RsvgHandle.html#RsvgHandlePrivate" title="RsvgHandlePrivate">RsvgHandlePrivate</a>; -struct <a class="link" href="RsvgHandle.html#RsvgHandleClass" title="struct RsvgHandleClass">RsvgHandleClass</a>; -struct <a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData">RsvgDimensionData</a>; -struct <a class="link" href="RsvgHandle.html#RsvgPositionData" title="struct RsvgPositionData">RsvgPositionData</a>; + <a class="link" href="RsvgHandle.html#RsvgHandleClass" title="RsvgHandleClass">RsvgHandleClass</a>; + <a class="link" href="RsvgHandle.html#RsvgDimensionData" title="RsvgDimensionData">RsvgDimensionData</a>; + <a class="link" href="RsvgHandle.html#RsvgPositionData" title="RsvgPositionData">RsvgPositionData</a>; <span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-init" title="rsvg_init ()">rsvg_init</a> (<em class="parameter"><code><span class="type">void</span></code></em>); <span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-term" title="rsvg_term ()">rsvg_term</a> (<em class="parameter"><code><span class="type">void</span></code></em>); <span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-set-default-dpi" title="rsvg_set_default_dpi ()">rsvg_set_default_dpi</a> (<em class="parameter"><code><span class="type">double</span> dpi</code></em>); @@ -70,12 +70,12 @@ <span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-handle-set-base-uri" title="rsvg_handle_set_base_uri ()">rsvg_handle_set_base_uri</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>, <em class="parameter"><code>const <span class="type">char</span> *base_uri</code></em>); <span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-handle-get-dimensions" title="rsvg_handle_get_dimensions ()">rsvg_handle_get_dimensions</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>, - <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>); + <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="RsvgHandle.html#rsvg-handle-get-dimensions-sub" title="rsvg_handle_get_dimensions_sub ()">rsvg_handle_get_dimensions_sub</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>, - <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>, + <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>, <em class="parameter"><code>const <span class="type">char</span> *id</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="RsvgHandle.html#rsvg-handle-get-position-sub" title="rsvg_handle_get_position_sub ()">rsvg_handle_get_position_sub</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>, - <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgPositionData" title="struct RsvgPositionData"><span class="type">RsvgPositionData</span></a> *position_data</code></em>, + <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgPositionData" title="RsvgPositionData"><span class="type">RsvgPositionData</span></a> *position_data</code></em>, <em class="parameter"><code>const <span class="type">char</span> *id</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="RsvgHandle.html#rsvg-handle-has-sub" title="rsvg_handle_has_sub ()">rsvg_handle_has_sub</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>, <em class="parameter"><code>const <span class="type">char</span> *id</code></em>); @@ -179,18 +179,18 @@ </div> <hr> <div class="refsect2"> -<a name="RsvgHandleClass"></a><h3>struct RsvgHandleClass</h3> -<pre class="programlisting">struct RsvgHandleClass { +<a name="RsvgHandleClass"></a><h3>RsvgHandleClass</h3> +<pre class="programlisting">typedef struct { GObjectClass parent; gpointer _abi_padding[15]; -}; +} RsvgHandleClass; </pre> </div> <hr> <div class="refsect2"> -<a name="RsvgDimensionData"></a><h3>struct RsvgDimensionData</h3> -<pre class="programlisting">struct RsvgDimensionData { +<a name="RsvgDimensionData"></a><h3>RsvgDimensionData</h3> +<pre class="programlisting">typedef struct { /** * SVG's width, in pixels */ @@ -210,16 +210,16 @@ * ex */ gdouble ex; -}; +} RsvgDimensionData; </pre> </div> <hr> <div class="refsect2"> -<a name="RsvgPositionData"></a><h3>struct RsvgPositionData</h3> -<pre class="programlisting">struct RsvgPositionData { +<a name="RsvgPositionData"></a><h3>RsvgPositionData</h3> +<pre class="programlisting">typedef struct { int x; int y; -}; +} RsvgPositionData; </pre> </div> <hr> @@ -497,7 +497,7 @@ <div class="refsect2"> <a name="rsvg-handle-get-dimensions"></a><h3>rsvg_handle_get_dimensions ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> rsvg_handle_get_dimensions (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>, - <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>);</pre> + <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>);</pre> <p> Get the SVG's size. Do not call from within the size_func callback, because an infinite loop will occur. </p> @@ -522,7 +522,7 @@ <div class="refsect2"> <a name="rsvg-handle-get-dimensions-sub"></a><h3>rsvg_handle_get_dimensions_sub ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> rsvg_handle_get_dimensions_sub (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>, - <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>, + <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>, <em class="parameter"><code>const <span class="type">char</span> *id</code></em>);</pre> <p> Get the size of a subelement of the SVG file. Do not call from within the size_func callback, because an infinite loop will occur. @@ -555,7 +555,7 @@ <div class="refsect2"> <a name="rsvg-handle-get-position-sub"></a><h3>rsvg_handle_get_position_sub ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> rsvg_handle_get_position_sub (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>, - <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgPositionData" title="struct RsvgPositionData"><span class="type">RsvgPositionData</span></a> *position_data</code></em>, + <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgPositionData" title="RsvgPositionData"><span class="type">RsvgPositionData</span></a> *position_data</code></em>, <em class="parameter"><code>const <span class="type">char</span> *id</code></em>);</pre> <p> Get the position of a subelement of the SVG file. Do not call from within diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/doc/html/api-index-full.html new/librsvg-2.34.0/doc/html/api-index-full.html --- old/librsvg-2.32.1/doc/html/api-index-full.html 2010-11-13 11:52:57.000000000 +0100 +++ new/librsvg-2.34.0/doc/html/api-index-full.html 2011-04-03 20:03:02.000000000 +0200 @@ -43,7 +43,7 @@ <a name="api-index-full"></a>API Index</h2></div></div></div> <a name="idx"></a><a name="idxD"></a><h3 class="title">D</h3> <dt> -<a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData">RsvgDimensionData</a>, struct in <a class="link" href="RsvgHandle.html" title="RsvgHandle">RsvgHandle</a> +<a class="link" href="RsvgHandle.html#RsvgDimensionData" title="RsvgDimensionData">RsvgDimensionData</a>, struct in <a class="link" href="RsvgHandle.html" title="RsvgHandle">RsvgHandle</a> </dt> <dd></dd> <a name="idxE"></a><h3 class="title">E</h3> @@ -109,7 +109,7 @@ </dt> <dd></dd> <dt> -<a class="link" href="RsvgHandle.html#RsvgHandleClass" title="struct RsvgHandleClass">RsvgHandleClass</a>, struct in <a class="link" href="RsvgHandle.html" title="RsvgHandle">RsvgHandle</a> +<a class="link" href="RsvgHandle.html#RsvgHandleClass" title="RsvgHandleClass">RsvgHandleClass</a>, struct in <a class="link" href="RsvgHandle.html" title="RsvgHandle">RsvgHandle</a> </dt> <dd></dd> <dt> @@ -296,7 +296,7 @@ </dt> <dd></dd> <dt> -<a class="link" href="RsvgHandle.html#RsvgPositionData" title="struct RsvgPositionData">RsvgPositionData</a>, struct in <a class="link" href="RsvgHandle.html" title="RsvgHandle">RsvgHandle</a> +<a class="link" href="RsvgHandle.html#RsvgPositionData" title="RsvgPositionData">RsvgPositionData</a>, struct in <a class="link" href="RsvgHandle.html" title="RsvgHandle">RsvgHandle</a> </dt> <dd></dd> <a name="idxS"></a><h3 class="title">S</h3> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/doc/html/index.html new/librsvg-2.34.0/doc/html/index.html --- old/librsvg-2.32.1/doc/html/index.html 2010-11-13 11:52:57.000000000 +0100 +++ new/librsvg-2.34.0/doc/html/index.html 2011-04-03 20:03:02.000000000 +0200 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">RSVG Libary Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - For RSVG version 2.33.0 + For RSVG version 2.34.0 . The latest version of this documentation can be found on-line at the <a class="ulink" href="http://library.gnome.org/devel/rsvg/index.html" target="_top">GNOME Library</a>. @@ -23,7 +23,7 @@ <div><p class="copyright">Copyright © 2003, 2004, 2005, 2006, 2007, 2008, 2009 Dom Lachowicz</p></div> <div><p class="copyright">Copyright © 2010 Christian Persch</p></div> <div><div class="legalnotice"> -<a name="id2685973"></a><p> +<a name="id2752601"></a><p> Permission is granted to copy, distribute and/or modify this document under the terms of the <em class="citetitle">GNU General Public Licence</em> published by the Free Software Foundation; either version 2 of the License, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/doc/html/rsvg-Version-check-and-feature-tests.html new/librsvg-2.34.0/doc/html/rsvg-Version-check-and-feature-tests.html --- old/librsvg-2.32.1/doc/html/rsvg-Version-check-and-feature-tests.html 2010-11-13 11:52:57.000000000 +0100 +++ new/librsvg-2.34.0/doc/html/rsvg-Version-check-and-feature-tests.html 2011-04-03 20:03:02.000000000 +0200 @@ -67,7 +67,7 @@ <hr> <div class="refsect2"> <a name="LIBRSVG-MINOR-VERSION:CAPS"></a><h3>LIBRSVG_MINOR_VERSION</h3> -<pre class="programlisting">#define LIBRSVG_MINOR_VERSION (33) +<pre class="programlisting">#define LIBRSVG_MINOR_VERSION (34) </pre> </div> <hr> @@ -79,7 +79,7 @@ <hr> <div class="refsect2"> <a name="LIBRSVG-VERSION:CAPS"></a><h3>LIBRSVG_VERSION</h3> -<pre class="programlisting">#define LIBRSVG_VERSION "2.33.0" +<pre class="programlisting">#define LIBRSVG_VERSION "2.34.0" </pre> </div> <hr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/doc/html/rsvg.devhelp new/librsvg-2.34.0/doc/html/rsvg.devhelp --- old/librsvg-2.32.1/doc/html/rsvg.devhelp 2010-11-13 11:52:56.000000000 +0100 +++ new/librsvg-2.34.0/doc/html/rsvg.devhelp 2011-04-03 20:03:02.000000000 +0200 @@ -27,9 +27,9 @@ <function name="rsvg_error_quark ()" link="RsvgHandle.html#rsvg-error-quark"/> <function name="RsvgHandle" link="RsvgHandle.html#RsvgHandle-struct"/> <function name="RsvgHandlePrivate" link="RsvgHandle.html#RsvgHandlePrivate"/> - <function name="struct RsvgHandleClass" link="RsvgHandle.html#RsvgHandleClass"/> - <function name="struct RsvgDimensionData" link="RsvgHandle.html#RsvgDimensionData"/> - <function name="struct RsvgPositionData" link="RsvgHandle.html#RsvgPositionData"/> + <function name="RsvgHandleClass" link="RsvgHandle.html#RsvgHandleClass"/> + <function name="RsvgDimensionData" link="RsvgHandle.html#RsvgDimensionData"/> + <function name="RsvgPositionData" link="RsvgHandle.html#RsvgPositionData"/> <function name="rsvg_init ()" link="RsvgHandle.html#rsvg-init"/> <function name="rsvg_term ()" link="RsvgHandle.html#rsvg-term"/> <function name="rsvg_set_default_dpi ()" link="RsvgHandle.html#rsvg-set-default-dpi"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/doc/html/rsvg.devhelp2 new/librsvg-2.34.0/doc/html/rsvg.devhelp2 --- old/librsvg-2.32.1/doc/html/rsvg.devhelp2 2010-11-13 11:52:56.000000000 +0100 +++ new/librsvg-2.34.0/doc/html/rsvg.devhelp2 2011-04-03 20:03:02.000000000 +0200 @@ -27,9 +27,9 @@ <keyword type="function" name="rsvg_error_quark ()" link="RsvgHandle.html#rsvg-error-quark"/> <keyword type="struct" name="RsvgHandle" link="RsvgHandle.html#RsvgHandle-struct"/> <keyword type="typedef" name="RsvgHandlePrivate" link="RsvgHandle.html#RsvgHandlePrivate"/> - <keyword type="struct" name="struct RsvgHandleClass" link="RsvgHandle.html#RsvgHandleClass"/> - <keyword type="struct" name="struct RsvgDimensionData" link="RsvgHandle.html#RsvgDimensionData"/> - <keyword type="struct" name="struct RsvgPositionData" link="RsvgHandle.html#RsvgPositionData"/> + <keyword type="struct" name="RsvgHandleClass" link="RsvgHandle.html#RsvgHandleClass"/> + <keyword type="struct" name="RsvgDimensionData" link="RsvgHandle.html#RsvgDimensionData"/> + <keyword type="struct" name="RsvgPositionData" link="RsvgHandle.html#RsvgPositionData"/> <keyword type="function" name="rsvg_init ()" link="RsvgHandle.html#rsvg-init" since="2.9"/> <keyword type="function" name="rsvg_term ()" link="RsvgHandle.html#rsvg-term" since="2.9"/> <keyword type="function" name="rsvg_set_default_dpi ()" link="RsvgHandle.html#rsvg-set-default-dpi" since="2.8"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/doc/version.xml new/librsvg-2.34.0/doc/version.xml --- old/librsvg-2.32.1/doc/version.xml 2010-11-13 11:52:50.000000000 +0100 +++ new/librsvg-2.34.0/doc/version.xml 2011-04-03 19:59:58.000000000 +0200 @@ -1 +1 @@ -2.32.1 +2.34.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/gdk-pixbuf-loader/Makefile.in new/librsvg-2.34.0/gdk-pixbuf-loader/Makefile.in --- old/librsvg-2.32.1/gdk-pixbuf-loader/Makefile.in 2010-11-13 11:52:20.000000000 +0100 +++ new/librsvg-2.34.0/gdk-pixbuf-loader/Makefile.in 2011-04-03 19:59:48.000000000 +0200 @@ -159,6 +159,8 @@ GTK2_CFLAGS = @GTK2_CFLAGS@ GTK2_LIBS = @GTK2_LIBS@ GTK3_BINARY_VERSION = @GTK3_BINARY_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/gdk-pixbuf-loader/io-svg.c new/librsvg-2.34.0/gdk-pixbuf-loader/io-svg.c --- old/librsvg-2.32.1/gdk-pixbuf-loader/io-svg.c 2010-05-30 23:21:34.000000000 +0200 +++ new/librsvg-2.34.0/gdk-pixbuf-loader/io-svg.c 2011-01-01 13:18:27.000000000 +0100 @@ -25,6 +25,7 @@ #include <stdlib.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include "rsvg-private.h" +#include "librsvg-features.h" typedef struct { RsvgHandle *handle; @@ -233,14 +234,14 @@ "image/svg-xml", "image/vnd.adobe.svg+xml", "text/xml-svg", -#ifdef HAVE_SVGZ +#if LIBRSVG_CHECK_FEATURE(SVGZ) "image/svg+xml-compressed", #endif NULL }; static gchar *extensions[] = { "svg", -#ifdef HAVE_SVGZ +#if LIBRSVG_CHECK_FEATURE(SVGZ) "svgz", "svg.gz", #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/gtk-engine/Makefile.am new/librsvg-2.34.0/gtk-engine/Makefile.am --- old/librsvg-2.32.1/gtk-engine/Makefile.am 2010-11-13 11:39:46.000000000 +0100 +++ new/librsvg-2.34.0/gtk-engine/Makefile.am 2011-01-01 13:18:27.000000000 +0100 @@ -1,16 +1,12 @@ SUBDIRS = DIST_SUBDIRS = examples -if ENABLE_GTK_ENGINE - SUBDIRS += examples gtk2_enginedir = $(libdir)/gtk-2.0/$(GTK2_BINARY_VERSION)/engines -gtk3_enginedir = $(libdir)/gtk-3.0/$(GTK3_BINARY_VERSION)/engines themedir = $(datadir)/themes -if HAVE_GTK_2 gtk2_engine_LTLIBRARIES = libsvg.la libsvg_la_SOURCES = \ @@ -46,47 +42,3 @@ if PLATFORM_WIN32 libsvg_la_LDFLAGS += -no-undefined endif - -endif # HAVE_GTK_2 - -if HAVE_GTK_3 -gtk3_engine_LTLIBRARIES = libsvg-3.la - -libsvg_3_la_SOURCES = \ - svg-draw.c \ - svg-main.c \ - svg-render.c \ - svg-rc-style.c \ - svg-rc-style.h \ - svg-style.h \ - svg.h - -libsvg_3_la_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -DG_LOG_DOMAIN=\"rsvg-engine-3\" \ - $(AM_CPPFLAGS) - -libsvg_3_la_CFLAGS = \ - $(GTK3_CFLAGS) \ - $(LIBRSVG_CFLAGS) \ - $(LIBCROCO_CFLAGS) \ - $(LIBGSF_CFLAGS) \ - $(AM_CFLAGS) - -libsvg_3_la_LDFLAGS = -avoid-version -module $(AM_LDFLAGS) - -libsvg_3_la_LIBADD = \ - $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \ - $(GTK3_LIBS) \ - $(LIBRSVG_LIBS) \ - $(LIBCROCO_LIBS) \ - $(LIBGSF_LIBS) - -if PLATFORM_WIN32 -libsvg_3_la_LDFLAGS += -no-undefined -endif - -endif # HAVE_GTK_3 - -endif # ENABLE_GTK_ENGINE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/gtk-engine/Makefile.in new/librsvg-2.34.0/gtk-engine/Makefile.in --- old/librsvg-2.32.1/gtk-engine/Makefile.in 2010-11-13 11:52:20.000000000 +0100 +++ new/librsvg-2.34.0/gtk-engine/Makefile.in 2011-04-03 19:59:49.000000000 +0200 @@ -34,9 +34,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@ENABLE_GTK_ENGINE_TRUE@am__append_1 = examples -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@@PLATFORM_WIN32_TRUE@am__append_2 = -no-undefined -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@@PLATFORM_WIN32_TRUE@am__append_3 = -no-undefined +@PLATFORM_WIN32_TRUE@am__append_1 = -no-undefined subdir = gtk-engine DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -68,47 +66,22 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(gtk2_enginedir)" \ - "$(DESTDIR)$(gtk3_enginedir)" -LTLIBRARIES = $(gtk2_engine_LTLIBRARIES) $(gtk3_engine_LTLIBRARIES) +am__installdirs = "$(DESTDIR)$(gtk2_enginedir)" +LTLIBRARIES = $(gtk2_engine_LTLIBRARIES) am__DEPENDENCIES_1 = -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_DEPENDENCIES = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(am__DEPENDENCIES_1) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(am__DEPENDENCIES_1) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(am__DEPENDENCIES_1) -am__libsvg_3_la_SOURCES_DIST = svg-draw.c svg-main.c svg-render.c \ - svg-rc-style.c svg-rc-style.h svg-style.h svg.h -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@am_libsvg_3_la_OBJECTS = libsvg_3_la-svg-draw.lo \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ libsvg_3_la-svg-main.lo \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ libsvg_3_la-svg-render.lo \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ libsvg_3_la-svg-rc-style.lo -libsvg_3_la_OBJECTS = $(am_libsvg_3_la_OBJECTS) +libsvg_la_DEPENDENCIES = \ + $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am_libsvg_la_OBJECTS = libsvg_la-svg-draw.lo libsvg_la-svg-main.lo \ + libsvg_la-svg-render.lo libsvg_la-svg-rc-style.lo +libsvg_la_OBJECTS = $(am_libsvg_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent -libsvg_3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libsvg_3_la_CFLAGS) \ - $(CFLAGS) $(libsvg_3_la_LDFLAGS) $(LDFLAGS) -o $@ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@am_libsvg_3_la_rpath = \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ -rpath \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(gtk3_enginedir) -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@libsvg_la_DEPENDENCIES = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(am__DEPENDENCIES_1) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(am__DEPENDENCIES_1) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(am__DEPENDENCIES_1) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(am__DEPENDENCIES_1) -am__libsvg_la_SOURCES_DIST = svg-draw.c svg-main.c svg-render.c \ - svg-rc-style.c svg-rc-style.h svg-style.h svg.h -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@am_libsvg_la_OBJECTS = libsvg_la-svg-draw.lo \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ libsvg_la-svg-main.lo \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ libsvg_la-svg-render.lo \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ libsvg_la-svg-rc-style.lo -libsvg_la_OBJECTS = $(am_libsvg_la_OBJECTS) libsvg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libsvg_la_CFLAGS) \ $(CFLAGS) $(libsvg_la_LDFLAGS) $(LDFLAGS) -o $@ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@am_libsvg_la_rpath = -rpath \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(gtk2_enginedir) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -135,9 +108,8 @@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libsvg_3_la_SOURCES) $(libsvg_la_SOURCES) -DIST_SOURCES = $(am__libsvg_3_la_SOURCES_DIST) \ - $(am__libsvg_la_SOURCES_DIST) +SOURCES = $(libsvg_la_SOURCES) +DIST_SOURCES = $(libsvg_la_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -219,6 +191,8 @@ GTK2_CFLAGS = @GTK2_CFLAGS@ GTK2_LIBS = @GTK2_LIBS@ GTK3_BINARY_VERSION = @GTK3_BINARY_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ @@ -335,78 +309,41 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = $(am__append_1) +SUBDIRS = examples DIST_SUBDIRS = examples -@ENABLE_GTK_ENGINE_TRUE@gtk2_enginedir = $(libdir)/gtk-2.0/$(GTK2_BINARY_VERSION)/engines -@ENABLE_GTK_ENGINE_TRUE@gtk3_enginedir = $(libdir)/gtk-3.0/$(GTK3_BINARY_VERSION)/engines -@ENABLE_GTK_ENGINE_TRUE@themedir = $(datadir)/themes -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@gtk2_engine_LTLIBRARIES = libsvg.la -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@libsvg_la_SOURCES = \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ svg-draw.c \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ svg-main.c \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ svg-render.c \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ svg-rc-style.c \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ svg-rc-style.h \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ svg-style.h \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ svg.h - -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@libsvg_la_CPPFLAGS = \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ -I$(top_srcdir) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ -I$(top_builddir) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ -DG_LOG_DOMAIN=\"rsvg-engine-2\" \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(AM_CPPFLAGS) - -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@libsvg_la_CFLAGS = \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(GTK2_CFLAGS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(LIBRSVG_CFLAGS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(LIBCROCO_CFLAGS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(LIBGSF_CFLAGS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(AM_CFLAGS) - -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@libsvg_la_LDFLAGS = \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ -avoid-version \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ -module $(AM_LDFLAGS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(am__append_2) -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@libsvg_la_LIBADD = \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(GTK2_LIBS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(LIBRSVG_LIBS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(LIBCROCO_LIBS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_2_TRUE@ $(LIBGSF_LIBS) - -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@gtk3_engine_LTLIBRARIES = libsvg-3.la -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_SOURCES = \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ svg-draw.c \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ svg-main.c \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ svg-render.c \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ svg-rc-style.c \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ svg-rc-style.h \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ svg-style.h \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ svg.h - -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_CPPFLAGS = \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ -I$(top_srcdir) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ -I$(top_builddir) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ -DG_LOG_DOMAIN=\"rsvg-engine-3\" \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(AM_CPPFLAGS) - -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_CFLAGS = \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(GTK3_CFLAGS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(LIBRSVG_CFLAGS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(LIBCROCO_CFLAGS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(LIBGSF_CFLAGS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(AM_CFLAGS) - -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_LDFLAGS = \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ -avoid-version \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ -module $(AM_LDFLAGS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(am__append_3) -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_LIBADD = \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(GTK3_LIBS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(LIBRSVG_LIBS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(LIBCROCO_LIBS) \ -@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(LIBGSF_LIBS) +gtk2_enginedir = $(libdir)/gtk-2.0/$(GTK2_BINARY_VERSION)/engines +themedir = $(datadir)/themes +gtk2_engine_LTLIBRARIES = libsvg.la +libsvg_la_SOURCES = \ + svg-draw.c \ + svg-main.c \ + svg-render.c \ + svg-rc-style.c \ + svg-rc-style.h \ + svg-style.h \ + svg.h + +libsvg_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -DG_LOG_DOMAIN=\"rsvg-engine-2\" \ + $(AM_CPPFLAGS) + +libsvg_la_CFLAGS = \ + $(GTK2_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ + $(LIBCROCO_CFLAGS) \ + $(LIBGSF_CFLAGS) \ + $(AM_CFLAGS) + +libsvg_la_LDFLAGS = -avoid-version -module $(AM_LDFLAGS) \ + $(am__append_1) +libsvg_la_LIBADD = \ + $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \ + $(GTK2_LIBS) \ + $(LIBRSVG_LIBS) \ + $(LIBCROCO_LIBS) \ + $(LIBGSF_LIBS) all: all-recursive @@ -473,41 +410,8 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -install-gtk3_engineLTLIBRARIES: $(gtk3_engine_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(gtk3_enginedir)" || $(MKDIR_P) "$(DESTDIR)$(gtk3_enginedir)" - @list='$(gtk3_engine_LTLIBRARIES)'; test -n "$(gtk3_enginedir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(gtk3_enginedir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(gtk3_enginedir)"; \ - } - -uninstall-gtk3_engineLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(gtk3_engine_LTLIBRARIES)'; test -n "$(gtk3_enginedir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(gtk3_enginedir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(gtk3_enginedir)/$$f"; \ - done - -clean-gtk3_engineLTLIBRARIES: - -test -z "$(gtk3_engine_LTLIBRARIES)" || rm -f $(gtk3_engine_LTLIBRARIES) - @list='$(gtk3_engine_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libsvg-3.la: $(libsvg_3_la_OBJECTS) $(libsvg_3_la_DEPENDENCIES) - $(AM_V_CCLD)$(libsvg_3_la_LINK) $(am_libsvg_3_la_rpath) $(libsvg_3_la_OBJECTS) $(libsvg_3_la_LIBADD) $(LIBS) libsvg.la: $(libsvg_la_OBJECTS) $(libsvg_la_DEPENDENCIES) - $(AM_V_CCLD)$(libsvg_la_LINK) $(am_libsvg_la_rpath) $(libsvg_la_OBJECTS) $(libsvg_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libsvg_la_LINK) -rpath $(gtk2_enginedir) $(libsvg_la_OBJECTS) $(libsvg_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -515,10 +419,6 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsvg_3_la-svg-draw.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsvg_3_la-svg-main.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsvg_3_la-svg-rc-style.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsvg_3_la-svg-render.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsvg_la-svg-draw.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsvg_la-svg-main.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsvg_la-svg-rc-style.Plo@am__quote@ @@ -548,38 +448,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -libsvg_3_la-svg-draw.lo: svg-draw.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsvg_3_la_CPPFLAGS) $(CPPFLAGS) $(libsvg_3_la_CFLAGS) $(CFLAGS) -MT libsvg_3_la-svg-draw.lo -MD -MP -MF $(DEPDIR)/libsvg_3_la-svg-draw.Tpo -c -o libsvg_3_la-svg-draw.lo `test -f 'svg-draw.c' || echo '$(srcdir)/'`svg-draw.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsvg_3_la-svg-draw.Tpo $(DEPDIR)/libsvg_3_la-svg-draw.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='svg-draw.c' object='libsvg_3_la-svg-draw.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsvg_3_la_CPPFLAGS) $(CPPFLAGS) $(libsvg_3_la_CFLAGS) $(CFLAGS) -c -o libsvg_3_la-svg-draw.lo `test -f 'svg-draw.c' || echo '$(srcdir)/'`svg-draw.c - -libsvg_3_la-svg-main.lo: svg-main.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsvg_3_la_CPPFLAGS) $(CPPFLAGS) $(libsvg_3_la_CFLAGS) $(CFLAGS) -MT libsvg_3_la-svg-main.lo -MD -MP -MF $(DEPDIR)/libsvg_3_la-svg-main.Tpo -c -o libsvg_3_la-svg-main.lo `test -f 'svg-main.c' || echo '$(srcdir)/'`svg-main.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsvg_3_la-svg-main.Tpo $(DEPDIR)/libsvg_3_la-svg-main.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='svg-main.c' object='libsvg_3_la-svg-main.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsvg_3_la_CPPFLAGS) $(CPPFLAGS) $(libsvg_3_la_CFLAGS) $(CFLAGS) -c -o libsvg_3_la-svg-main.lo `test -f 'svg-main.c' || echo '$(srcdir)/'`svg-main.c - -libsvg_3_la-svg-render.lo: svg-render.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsvg_3_la_CPPFLAGS) $(CPPFLAGS) $(libsvg_3_la_CFLAGS) $(CFLAGS) -MT libsvg_3_la-svg-render.lo -MD -MP -MF $(DEPDIR)/libsvg_3_la-svg-render.Tpo -c -o libsvg_3_la-svg-render.lo `test -f 'svg-render.c' || echo '$(srcdir)/'`svg-render.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsvg_3_la-svg-render.Tpo $(DEPDIR)/libsvg_3_la-svg-render.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='svg-render.c' object='libsvg_3_la-svg-render.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsvg_3_la_CPPFLAGS) $(CPPFLAGS) $(libsvg_3_la_CFLAGS) $(CFLAGS) -c -o libsvg_3_la-svg-render.lo `test -f 'svg-render.c' || echo '$(srcdir)/'`svg-render.c - -libsvg_3_la-svg-rc-style.lo: svg-rc-style.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsvg_3_la_CPPFLAGS) $(CPPFLAGS) $(libsvg_3_la_CFLAGS) $(CFLAGS) -MT libsvg_3_la-svg-rc-style.lo -MD -MP -MF $(DEPDIR)/libsvg_3_la-svg-rc-style.Tpo -c -o libsvg_3_la-svg-rc-style.lo `test -f 'svg-rc-style.c' || echo '$(srcdir)/'`svg-rc-style.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsvg_3_la-svg-rc-style.Tpo $(DEPDIR)/libsvg_3_la-svg-rc-style.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='svg-rc-style.c' object='libsvg_3_la-svg-rc-style.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsvg_3_la_CPPFLAGS) $(CPPFLAGS) $(libsvg_3_la_CFLAGS) $(CFLAGS) -c -o libsvg_3_la-svg-rc-style.lo `test -f 'svg-rc-style.c' || echo '$(srcdir)/'`svg-rc-style.c - libsvg_la-svg-draw.lo: svg-draw.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsvg_la_CPPFLAGS) $(CPPFLAGS) $(libsvg_la_CFLAGS) $(CFLAGS) -MT libsvg_la-svg-draw.lo -MD -MP -MF $(DEPDIR)/libsvg_la-svg-draw.Tpo -c -o libsvg_la-svg-draw.lo `test -f 'svg-draw.c' || echo '$(srcdir)/'`svg-draw.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsvg_la-svg-draw.Tpo $(DEPDIR)/libsvg_la-svg-draw.Plo @@ -816,7 +684,7 @@ all-am: Makefile $(LTLIBRARIES) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(gtk2_enginedir)" "$(DESTDIR)$(gtk3_enginedir)"; do \ + for dir in "$(DESTDIR)$(gtk2_enginedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -846,8 +714,8 @@ @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-generic clean-gtk2_engineLTLIBRARIES \ - clean-gtk3_engineLTLIBRARIES clean-libtool mostlyclean-am +clean-am: clean-generic clean-gtk2_engineLTLIBRARIES clean-libtool \ + mostlyclean-am distclean: distclean-recursive -rm -rf ./$(DEPDIR) @@ -867,8 +735,7 @@ info-am: -install-data-am: install-gtk2_engineLTLIBRARIES \ - install-gtk3_engineLTLIBRARIES +install-data-am: install-gtk2_engineLTLIBRARIES install-dvi: install-dvi-recursive @@ -914,30 +781,26 @@ ps-am: -uninstall-am: uninstall-gtk2_engineLTLIBRARIES \ - uninstall-gtk3_engineLTLIBRARIES +uninstall-am: uninstall-gtk2_engineLTLIBRARIES .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-gtk2_engineLTLIBRARIES clean-gtk3_engineLTLIBRARIES \ - clean-libtool ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am \ - install-gtk2_engineLTLIBRARIES install-gtk3_engineLTLIBRARIES \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-gtk2_engineLTLIBRARIES \ - uninstall-gtk3_engineLTLIBRARIES + clean-gtk2_engineLTLIBRARIES clean-libtool ctags \ + ctags-recursive distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-gtk2_engineLTLIBRARIES install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-gtk2_engineLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/gtk-engine/examples/Makefile.in new/librsvg-2.34.0/gtk-engine/examples/Makefile.in --- old/librsvg-2.32.1/gtk-engine/examples/Makefile.in 2010-11-13 11:52:20.000000000 +0100 +++ new/librsvg-2.34.0/gtk-engine/examples/Makefile.in 2011-04-03 19:59:49.000000000 +0200 @@ -133,6 +133,8 @@ GTK2_CFLAGS = @GTK2_CFLAGS@ GTK2_LIBS = @GTK2_LIBS@ GTK3_BINARY_VERSION = @GTK3_BINARY_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/gtk-engine/examples/bubble/Makefile.in new/librsvg-2.34.0/gtk-engine/examples/bubble/Makefile.in --- old/librsvg-2.32.1/gtk-engine/examples/bubble/Makefile.in 2010-11-13 11:52:20.000000000 +0100 +++ new/librsvg-2.34.0/gtk-engine/examples/bubble/Makefile.in 2011-04-03 19:59:49.000000000 +0200 @@ -118,6 +118,8 @@ GTK2_CFLAGS = @GTK2_CFLAGS@ GTK2_LIBS = @GTK2_LIBS@ GTK3_BINARY_VERSION = @GTK3_BINARY_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/librsvg-features.h new/librsvg-2.34.0/librsvg-features.h --- old/librsvg-2.32.1/librsvg-features.h 2010-11-13 11:52:49.000000000 +0100 +++ new/librsvg-2.34.0/librsvg-features.h 2011-04-03 19:59:57.000000000 +0200 @@ -2,9 +2,9 @@ #define LIBRSVG_FEATURES_H 1 #define LIBRSVG_MAJOR_VERSION (2) -#define LIBRSVG_MINOR_VERSION (32) -#define LIBRSVG_MICRO_VERSION (1) -#define LIBRSVG_VERSION "2.32.1" +#define LIBRSVG_MINOR_VERSION (34) +#define LIBRSVG_MICRO_VERSION (0) +#define LIBRSVG_VERSION "2.34.0" #define LIBRSVG_CHECK_VERSION(major,minor,micro) \ (LIBRSVG_MAJOR_VERSION > (major) || \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/librsvg-zip.in new/librsvg-2.34.0/librsvg-zip.in --- old/librsvg-2.32.1/librsvg-zip.in 2010-05-30 23:21:34.000000000 +0200 +++ new/librsvg-2.34.0/librsvg-zip.in 2011-01-01 13:18:27.000000000 +0100 @@ -22,15 +22,17 @@ zip -r -D $DEVZIP -@ <<EOF bin/rsvg-convert.exe bin/rsvg-view.exe -include/librsvg-2 +include/librsvg-2.0 lib/librsvg-2.dll.a lib/pkgconfig/librsvg-2.0.pc EOF -gtk_binary_version=`pkg-config --variable=gtk_binary_version gtk+-2.0` - rm $ENGINEZIP -zip $ENGINEZIP lib/gtk-2.0/${gtk_binary_version}/engines/libsvg.dll +zip $ENGINEZIP lib/gtk-2.0/@GTK2_BINARY_VERSION@/engines/libsvg.dll rm $LOADERZIP -zip $LOADERZIP lib/gtk-2.0/${gtk_binary_version}/loaders/svg_loader.dll +mkdir -p lib/gdk-pixbuf-2.0/@gdk_pixbuf_binary_version@/loaders +mv @gdk_pixbuf_binarydir@/loaders/libpixbufloader-svg.dll lib/gdk-pixbuf-2.0/@gdk_pixbuf_binary_version@/loaders +rm -f @gdk_pixbuf_binarydir@/loaders/libpixbufloader-svg.dll.a +rm -f @gdk_pixbuf_binarydir@/loaders/libpixbufloader-svg.la +zip $LOADERZIP lib/gdk-pixbuf-2.0/@gdk_pixbuf_binary_version@/loaders/libpixbufloader-svg.dll diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/librsvg.spec new/librsvg-2.34.0/librsvg.spec --- old/librsvg-2.32.1/librsvg.spec 2010-11-13 11:52:58.000000000 +0100 +++ new/librsvg-2.34.0/librsvg.spec 2011-04-03 20:03:02.000000000 +0200 @@ -2,7 +2,7 @@ %define __spec_install_post /usr/lib/rpm/brp-compress Name: librsvg2 Summary: An SVG library based on cairo. -Version: 2.32.1 +Version: 2.34.0 Release: 2 License: LGPL Group: System Environment/Libraries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/rsvg-cairo-draw.c new/librsvg-2.34.0/rsvg-cairo-draw.c --- old/librsvg-2.32.1/rsvg-cairo-draw.c 2010-11-13 11:49:37.000000000 +0100 +++ new/librsvg-2.34.0/rsvg-cairo-draw.c 2011-04-03 19:46:55.000000000 +0200 @@ -517,6 +517,11 @@ bbox, rsvg_current_state (ctx)->current_color); cairo_set_line_width (render->cr, _rsvg_css_normalize_length (&state->stroke_width, ctx, 'h')); + cairo_set_miter_limit (render->cr, state->miter_limit); + cairo_set_line_cap (render->cr, (cairo_line_cap_t) state->cap); + cairo_set_line_join (render->cr, (cairo_line_join_t) state->join); + cairo_set_dash (render->cr, state->dash.dash, state->dash.n_dash, + _rsvg_css_normalize_length (&state->dash.offset, ctx, 'o')); cairo_stroke (render->cr); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/rsvg-convert.c new/librsvg-2.34.0/rsvg-convert.c --- old/librsvg-2.32.1/rsvg-convert.c 2010-11-13 11:39:46.000000000 +0100 +++ new/librsvg-2.34.0/rsvg-convert.c 2011-01-01 13:18:27.000000000 +0100 @@ -52,6 +52,10 @@ #include <cairo-svg.h> #endif +#ifdef CAIRO_HAS_XML_SURFACE +#include <cairo-xml.h> +#endif + static void display_error (GError * err) { @@ -161,7 +165,7 @@ {"height", 'h', 0, G_OPTION_ARG_INT, &height, N_("height [optional; defaults to the SVG's height]"), N_("<int>")}, {"format", 'f', 0, G_OPTION_ARG_STRING, &format, - N_("save format [optional; defaults to 'png']"), N_("[png, pdf, ps, svg]")}, + N_("save format [optional; defaults to 'png']"), N_("[png, pdf, ps, svg, xml, recording]")}, {"output", 'o', 0, G_OPTION_ARG_STRING, &output, N_("output filename [optional; defaults to stdout]"), NULL}, {"keep-aspect-ratio", 'a', 0, G_OPTION_ARG_NONE, &keep_aspect_ratio, @@ -295,6 +299,18 @@ surface = cairo_svg_surface_create_for_stream (rsvg_cairo_write_func, output_file, dimensions.width, dimensions.height); #endif +#ifdef CAIRO_HAS_XML_SURFACE + else if (!strcmp (format, "xml")) { + cairo_device_t *device = cairo_xml_create_for_stream (rsvg_cairo_write_func, output_file); + surface = cairo_xml_surface_create (device, CAIRO_CONTENT_COLOR_ALPHA, + dimensions.width, dimensions.height); + cairo_device_destroy (device); + } +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE (1, 10, 0) + else if (!strcmp (format, "recording")) + surface = cairo_recording_surface_create (CAIRO_CONTENT_COLOR_ALPHA, NULL); +#endif +#endif else { fprintf (stderr, _("Unknown output format.")); exit (1); @@ -320,13 +336,25 @@ if (!format || !strcmp (format, "png")) cairo_surface_write_to_png_stream (surface, rsvg_cairo_write_func, output_file); - else +#if CAIRO_HAS_XML_SURFACE && CAIRO_VERSION >= CAIRO_VERSION_ENCODE (1, 10, 0) + else if (!strcmp (format, "recording")) { + cairo_device_t *device = cairo_xml_create_for_stream (rsvg_cairo_write_func, output_file); + cairo_xml_for_recording_surface (device, surface); + cairo_device_destroy (device); + } +#endif + else if (!strcmp (format, "xml")) + ; + else if (!strcmp (format, "svg") || !strcmp (format, "pdf") || !strcmp (format, "ps")) cairo_show_page (cr); + else + g_assert_not_reached (); g_object_unref (rsvg); } cairo_destroy (cr); + cairo_surface_destroy (surface); fclose (output_file); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/rsvg-styles.c new/librsvg-2.34.0/rsvg-styles.c --- old/librsvg-2.32.1/rsvg-styles.c 2010-09-27 19:18:35.000000000 +0200 +++ new/librsvg-2.34.0/rsvg-styles.c 2011-04-03 19:46:55.000000000 +0200 @@ -887,7 +887,10 @@ } else { *important = FALSE; } - *value = g_strdup (g_strstrip (strings[0])); + if (strings[0]) + *value = g_strdup (g_strstrip (strings[0])); + else + *value = g_strdup (""); g_strfreev (strings); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/rsvg.1 new/librsvg-2.34.0/rsvg.1 --- old/librsvg-2.32.1/rsvg.1 2010-06-10 15:09:24.000000000 +0200 +++ new/librsvg-2.34.0/rsvg.1 2011-04-03 19:46:55.000000000 +0200 @@ -6,7 +6,7 @@ [options] in.svg out.png .I "" .SH DESCRIPTION -RSVG coverts SVG images into PNG, JPEG, and ICO raster images. +RSVG converts SVG images into PNG, JPEG, and ICO raster images. .SS OPTIONS .TP .I "\-d \-\-dpi-x number" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/test-display.c new/librsvg-2.34.0/test-display.c --- old/librsvg-2.32.1/test-display.c 2010-11-13 11:39:46.000000000 +0100 +++ new/librsvg-2.34.0/test-display.c 2011-01-01 13:18:27.000000000 +0100 @@ -29,7 +29,13 @@ #include <gtk/gtk.h> #include <gdk/gdk.h> + +#if GTK_CHECK_VERSION(2,90,7) +#define GDK_KEY(symbol) GDK_KEY_##symbol +#else #include <gdk/gdkkeysyms.h> +#define GDK_KEY(symbol) GDK_##symbol +#endif #define DEFAULT_WIDTH 640 #define DEFAULT_HEIGHT 480 @@ -532,7 +538,7 @@ g_signal_connect (menu_item, "activate", G_CALLBACK (copy_svg_location), info); gtk_widget_show (menu_item); gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menu_item); - gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_C, + gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_KEY(C), GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); } @@ -540,7 +546,7 @@ g_signal_connect (menu_item, "activate", G_CALLBACK (save_svg), info); gtk_widget_show (menu_item); gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menu_item); - gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_S, GDK_CONTROL_MASK, + gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_KEY(S), GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); menu_item = gtk_image_menu_item_new_with_label (_("Save as PNG")); @@ -550,7 +556,7 @@ g_signal_connect (menu_item, "activate", G_CALLBACK (save_pixbuf), info); gtk_widget_show (menu_item); gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menu_item); - gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_S, + gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_KEY(S), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE); #if GTK_CHECK_VERSION(2,10,0) @@ -558,7 +564,7 @@ g_signal_connect (menu_item, "activate", G_CALLBACK (print_pixbuf), info); gtk_widget_show (menu_item); gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menu_item); - gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_P, GDK_CONTROL_MASK, + gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_KEY(P), GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); #endif @@ -566,14 +572,14 @@ g_signal_connect (menu_item, "activate", G_CALLBACK (zoom_in), info); gtk_widget_show (menu_item); gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menu_item); - gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_plus, + gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_KEY(plus), GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_OUT, NULL); g_signal_connect (menu_item, "activate", G_CALLBACK (zoom_out), info); gtk_widget_show (menu_item); gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menu_item); - gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_minus, + gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_KEY(minus), GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); info->popup_menu = popup_menu; @@ -684,11 +690,15 @@ if (gdk_color_parse (color, &bg_color)) { GtkWidget *parent_widget = gtk_widget_get_parent (info->image); +#if GTK_CHECK_VERSION (2, 90, 8) + gtk_widget_modify_bg (parent_widget, GTK_STATE_NORMAL, &bg_color); +#else if (gdk_colormap_alloc_color (gtk_widget_get_colormap (parent_widget), &bg_color, FALSE, TRUE)) gtk_widget_modify_bg (parent_widget, GTK_STATE_NORMAL, &bg_color); else g_warning (_("Couldn't allocate color '%s'"), color); +#endif } else g_warning (_("Couldn't parse color '%s'"), color); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/tests/Makefile.in new/librsvg-2.34.0/tests/Makefile.in --- old/librsvg-2.32.1/tests/Makefile.in 2010-11-13 11:52:20.000000000 +0100 +++ new/librsvg-2.34.0/tests/Makefile.in 2011-04-03 19:59:49.000000000 +0200 @@ -198,6 +198,8 @@ GTK2_CFLAGS = @GTK2_CFLAGS@ GTK2_LIBS = @GTK2_LIBS@ GTK3_BINARY_VERSION = @GTK3_BINARY_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/tests/pdiff/Makefile.in new/librsvg-2.34.0/tests/pdiff/Makefile.in --- old/librsvg-2.32.1/tests/pdiff/Makefile.in 2010-11-13 11:52:20.000000000 +0100 +++ new/librsvg-2.34.0/tests/pdiff/Makefile.in 2011-04-03 19:59:49.000000000 +0200 @@ -137,6 +137,8 @@ GTK2_CFLAGS = @GTK2_CFLAGS@ GTK2_LIBS = @GTK2_LIBS@ GTK3_BINARY_VERSION = @GTK3_BINARY_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librsvg-2.32.1/tools/Makefile.in new/librsvg-2.34.0/tools/Makefile.in --- old/librsvg-2.32.1/tools/Makefile.in 2010-11-13 11:52:20.000000000 +0100 +++ new/librsvg-2.34.0/tools/Makefile.in 2011-04-03 19:59:49.000000000 +0200 @@ -153,6 +153,8 @@ GTK2_CFLAGS = @GTK2_CFLAGS@ GTK2_LIBS = @GTK2_LIBS@ GTK3_BINARY_VERSION = @GTK3_BINARY_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0