Author: wiget Date: Sun Jan 9 23:01:58 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 2.99.0 - fix shebang in gtk-builder-convert - separate gtk-builder-convert and gtk-update-icon-cache programs to subpackages (same to be done in gtk+2.spec) - fix some new bashisms
---- Files affected: packages/gtk+3: bashisms.patch (1.1 -> 1.2) , gtk+3.spec (1.12 -> 1.13) , python.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gtk+3/bashisms.patch diff -u packages/gtk+3/bashisms.patch:1.1 packages/gtk+3/bashisms.patch:1.2 --- packages/gtk+3/bashisms.patch:1.1 Tue Dec 28 22:32:11 2010 +++ packages/gtk+3/bashisms.patch Mon Jan 10 00:01:53 2011 @@ -1,43 +1,29 @@ -From 7032996c76c577a9ab13c47f01ecadc762b87506 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <[email protected]> -Date: Tue, 28 Dec 2010 00:24:05 +0000 -Subject: Remove bashisms from configure.ac - -Pointed out by Koop Mast in -https://bugzilla.gnome.org/show_bug.cgi?id=637974 ---- -diff --git a/configure.ac b/configure.ac -index 7be4641..a90f7d1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1520,16 +1520,16 @@ _______EOF - ],[ - gdk_windowing='' - if expr "$gdktarget" : ".*x11.*" > /dev/null ; then -- gdk_windowing+=' -+ gdk_windowing='$gdk_windowing - #define GDK_WINDOWING_X11' +--- gtk+-2.99.0/configure.ac.wiget 2011-01-06 04:55:33.000000000 +0100 ++++ gtk+-2.99.0/configure.ac 2011-01-09 21:32:51.429526702 +0100 +@@ -324,7 +324,7 @@ else fi - if expr "$gdktarget" : ".*win32.*" > /dev/null ; then -- gdk_windowing+=' -+ gdk_windowing='$gdk_windowing - #define GDK_NATIVE_WINDOW_POINTER - #define GDK_WINDOWING_WIN32' - fi - if expr "$gdktarget" : ".*quartz.*" > /dev/null ; then -- gdk_windowing=' -+ gdk_windowing='$gdk_windowing - #define GDK_WINDOWING_QUARTZ' - fi - ]) -@@ -1551,7 +1551,7 @@ AC_ARG_ENABLE(Bsymbolic, - enable_Bsymbolic=no) - LDFLAGS="${SAVED_LDFLAGS}"]) - --if test "x${enable_Bsymbolic}" == "xyes"; then -+if test "x${enable_Bsymbolic}" = "xyes" ; then - GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions - fi - AC_SUBST(GTK_LINK_FLAGS) --- -cgit v0.8.3.1 + + # strip leading space +-GDK_BACKENDS=${GDK_BACKENDS/# } ++GDK_BACKENDS=${GDK_BACKENDS# } + + AC_SUBST(GDK_BACKENDS) + +@@ -1162,7 +1162,7 @@ if test "x$enable_x11_backend" == xyes; + AM_CONDITIONAL(USE_X11, true) + + # strip leading space +- X_EXTENSIONS=${X_EXTENSIONS/# } ++ X_EXTENSIONS=${X_EXTENSIONS# } + + else + XPACKAGES= +@@ -1658,7 +1658,7 @@ perf/Makefile + AC_OUTPUT + + # beautify the immodule list a bit +-included_immodules=${included_immodules//,/ } ++included_immodules="$(echo $included_immodules|sed -e 's/,/ /g')" + included_immodules=${included_immodules:-none} + + echo "configuration:" ================================================================ Index: packages/gtk+3/gtk+3.spec diff -u packages/gtk+3/gtk+3.spec:1.12 packages/gtk+3/gtk+3.spec:1.13 --- packages/gtk+3/gtk+3.spec:1.12 Tue Dec 28 22:32:11 2010 +++ packages/gtk+3/gtk+3.spec Mon Jan 10 00:01:53 2011 @@ -1,10 +1,5 @@ # $Revision$, $Date$ # TODO -# - solve this: -#| /tmp/gtk+2-2.12.8-root-glen $ find -type f|xargs file|grep -i python -#| ./usr/bin/gtk-builder-convert: a python script text executable -#| /tmp/gtk+2-2.12.8-root-glen $ head -n 1 ./usr/bin/gtk-builder-convert -#| !/usr/bin/env python # - fix libgailutil linking # # Conditional build: @@ -21,13 +16,14 @@ Summary(pl.UTF-8): GIMP Toolkit Summary(tr.UTF-8): GIMP ToolKit arayüz kitaplığı Name: gtk+3 -Version: 2.91.7 +Version: 2.99.0 Release: 1 License: LGPL v2+ Group: X11/Libraries -Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.91/gtk+-%{version}.tar.bz2 -# Source0-md5: 221d8f13a75be17f51759bedee7db477 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.99/gtk+-%{version}.tar.bz2 +# Source0-md5: 8991403e30457362f1bf20f1313a6456 Patch0: bashisms.patch +Patch1: python.patch URL: http://www.gtk.org/ BuildRequires: atk-devel >= 1:1.30.0 BuildRequires: autoconf >= 2.62 @@ -126,6 +122,13 @@ Başlangıçta GIMP için yazılmış X kitaplıkları. Şu anda başka programlarca da kullanılmaktadır. +%package -n gtk-update-icon-cache +Summary: Update icon cache used by GTK+ library +Group: Applications/System + +%description -n gtk-update-icon-cache +Update icon cache used by GTK+ library. + %package devel Summary: GTK+ header files and development documentation Summary(cs.UTF-8): Sada nástrojů GIMP a kreslící kit GIMP @@ -161,6 +164,15 @@ %description devel -l pl.UTF-8 Pliki nagłówkowe i dokumentacja do bibliotek GTK+. +%package -n gtk-builder-convert +Summary: Convert glade files to GtkBuilder format +Group: Development/Tools +Requires: python-modules + +%description -n gtk-builder-convert +Converts Glade files into XML files which can be loaded with +GtkBuilder. + %package static Summary: GTK+ static libraries Summary(pl.UTF-8): Biblioteki statyczne GTK+ @@ -212,6 +224,7 @@ %prep %setup -q -n gtk+-%{version} %patch0 -p1 +%patch1 -p1 %build rm m4/introspection.m4 @@ -223,14 +236,16 @@ %{__automake} %configure \ --disable-silent-rules \ - %{!?with_cups:ac_cv_path_CUPS_CONFIG=no} \ + %{__disable cups} \ %{?debug:--enable-debug=yes} \ - --%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \ + %{__enable_disable apidocs gtk-doc} \ --enable-man \ - --%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \ - --with-gdktarget=x11 \ + %{__enable_disable static_libs static} \ + --enable-x11-backend \ --with-html-dir=%{_gtkdocdir} \ - --with-xinput=yes + --enable-xinput \ + --enable-xkb \ + --enable-xinerama %{__make} %install @@ -285,7 +300,6 @@ %defattr(644,root,root,755) %doc AUTHORS NEWS README %attr(755,root,root) %{_bindir}/gtk-query-immodules-3.0%{pqext} -%attr(755,root,root) %{_bindir}/gtk-update-icon-cache-3.0 %attr(755,root,root) %{_bindir}/gtk3-demo %attr(755,root,root) %{_libdir}/libgailutil-3.0.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgailutil-3.0.so.0 @@ -335,12 +349,15 @@ %dir %{_datadir}/themes/Raleigh/gtk-* %{_datadir}/themes/Raleigh/gtk-*/gtkrc %{_mandir}/man1/gtk-query-immodules-3.0.1* -%{_mandir}/man1/gtk-update-icon-cache-3.0.1* + +%files -n gtk-update-icon-cache +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/gtk-update-icon-cache +%{_mandir}/man1/gtk-update-icon-cache.1* %files devel %defattr(644,root,root,755) %doc ChangeLog -%attr(755,root,root) %{_bindir}/gtk-builder-convert-3.0 %attr(755,root,root) %{_libdir}/libgailutil-3.0.so %attr(755,root,root) %{_libdir}/libgdk-3.0.so %attr(755,root,root) %{_libdir}/libgtk-3.0.so @@ -352,15 +369,19 @@ %{_aclocaldir}/gtk-3.0.m4 %{_pkgconfigdir}/gail-3.0.pc %{_pkgconfigdir}/gdk-3.0.pc -%{_pkgconfigdir}/gdk-3.0.pc +%{_pkgconfigdir}/gdk-x11-3.0.pc %{_pkgconfigdir}/gtk+-3.0.pc %{_pkgconfigdir}/gtk+-unix-print-3.0.pc %{_pkgconfigdir}/gtk+-x11-3.0.pc -%{_mandir}/man1/gtk-builder-convert-3.0.1* %{_datadir}/gir-1.0/Gdk-3.0.gir %{_datadir}/gir-1.0/GdkX11-3.0.gir %{_datadir}/gir-1.0/Gtk-3.0.gir +%files -n gtk-builder-convert +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/gtk-builder-convert +%{_mandir}/man1/gtk-builder-convert.1* + %if %{with static_libs} %files static %defattr(644,root,root,755) @@ -393,6 +414,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2011/01/09 23:01:53 wiget +- updated to 2.99.0 +- fix shebang in gtk-builder-convert +- separate gtk-builder-convert and gtk-update-icon-cache programs to subpackages (same to be done in gtk+2.spec) +- fix some new bashisms + Revision 1.12 2010/12/28 21:32:11 wiget - 2.91.7 (soname change) ================================================================ Index: packages/gtk+3/python.patch diff -u /dev/null packages/gtk+3/python.patch:1.1 --- /dev/null Mon Jan 10 00:01:58 2011 +++ packages/gtk+3/python.patch Mon Jan 10 00:01:53 2011 @@ -0,0 +1,8 @@ +--- gtk+-2.99.0/gtk/gtk-builder-convert.wig 2011-01-09 22:55:41.546478959 +0100 ++++ gtk+-2.99.0/gtk/gtk-builder-convert 2011-01-09 22:56:25.132114551 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # + # Copyright (C) 2006-2008 Async Open Source + # Henrique Romano <[email protected]> ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk+3/bashisms.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk+3/gtk+3.spec?r1=1.12&r2=1.13&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
