Hello community, here is the log from the commit of package gtk-engines checked in at Tue Jan 23 15:21:59 CET 2007. -------- --- GNOME/gtk-engines/gtk-engines.changes 2006-03-13 17:35:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/gtk-engines/gtk-engines.changes 2007-01-23 14:51:46.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 22 19:25:06 CET 2007 - sbrabec@suse.cz + +- Prefix changed to /usr. +- Spec file cleanup. +- Fixed gcc warnings. + +------------------------------------------------------------------- New: ---- gtkstep-automake.patch newpsy-automake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk-engines.spec ++++++ --- /var/tmp/diff_new_pack.DzL902/_old 2007-01-23 15:21:29.000000000 +0100 +++ /var/tmp/diff_new_pack.DzL902/_new 2007-01-23 15:21:29.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gtk-engines (Version 0.12) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,13 +14,13 @@ BuildRequires: gdk-pixbuf-devel giflib-devel libpng-devel libtiff-devel xorg-x11 # Needed only for ximian-artwork configure success: BuildRequires: glib2-devel gtk2-devel icon-naming-utils intltool -License: GPL +License: GNU General Public License (GPL) Group: System/Libraries Obsoletes: gtkeng Autoreqprov: on Summary: Theme Engines for GTK+ Version: 0.12 -Release: 973 +Release: 1006 Source0: ftp://ftp.gnome.org/pub/GNOME/stable/sources/gtk-engines/gtk-engines-%{version}.tar.bz2 Source1: ColorStep-1.2.x-200005281440.tar.bz2 Source2: GTKstep-1.2.x-200001110524.tar.bz2 @@ -32,6 +32,8 @@ Source7: gtk-smooth-engine-0.6.0.1.tar.bz2 Source8: ximian-artwork-0.6.1.tar.bz2 Patch: gtk-engines-ia64.dif +Patch2: gtkstep-automake.patch +Patch3: newpsy-automake.patch Patch5: Xenophilia-1.2.x.patch Patch6: Xenophilia-lib64.dif Patch7: gtk-clean-theme.patch @@ -39,13 +41,9 @@ Patch9: gtkstep-2.0.patch Patch10: newspy.patch Patch11: colorstep-0.4.patch -# Fix from gnome-themes Patch16: gnome-themes-fortify.patch URL: http://gtk.themes.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -# Part of gnome-themes. -NoSource: 7 -NoPatch: 16 %description This package contains the graphical engines for the various GTK+ @@ -64,7 +62,7 @@ The Rasterman <raster@redhat.com> %prep -%setup -b 1 -b 2 -b 3 -b 4 -b 5 -b 6 -b 7 -b 8 +%setup -q -b 1 -b 2 -b 3 -b 4 -b 5 -b 6 -b 7 -b 8 %patch cd ../Xenophilia* %patch5 @@ -77,91 +75,86 @@ %patch8 cd ../gtkstep-2.0 %patch9 +%patch2 cd ../newpsy %patch10 +%patch3 cd ../colorstep-0.4 %patch11 cd ../ximian-artwork-0.6.1/ %patch16 -p1 %build -%{?suse_update_config:%{suse_update_config -f}} -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure --prefix=/opt/gnome --libdir=/opt/gnome/%_lib -make +autoreconf -f -i +%configure +make %{?jobs:-j%jobs} cd ../Xenophilia* -make +make %{?jobs:-j%jobs} cd ../colorstep* -%{?suse_update_config:%{suse_update_config -f}} -libtoolize --force -aclocal -automake --foreign -autoconf -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure --prefix=/opt/gnome --libdir=/opt/gnome/%_lib -make +autoreconf -f -i +%configure +make %{?jobs:-j%jobs} cd ../gtk-Mac2-theme +# Cannot autoreconf: No configure.in! %{?suse_update_config:%{suse_update_config -f}} -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure --prefix=/opt/gnome --libdir=/opt/gnome/%_lib -make +%configure +# FIXME: Ignore following false warning: +# is used uninitialized in this function +# mac2_theme_draw.c: 1319 +# Most probably http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22197 +make %{?jobs:-j%jobs} cd ../gtk-clean-theme +# Cannot autoreconf: No configure.in! %{?suse_update_config:%{suse_update_config -f}} -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure --prefix=/opt/gnome --libdir=/opt/gnome/%_lib -make +%configure +make %{?jobs:-j%jobs} cd ../gtkstep* -%{?suse_update_config:%{suse_update_config -f}} -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure --prefix=/opt/gnome --libdir=/opt/gnome/%_lib -make +autoreconf -f -i +%configure +make %{?jobs:-j%jobs} cd ../newpsy -%{?suse_update_config:%{suse_update_config -f}} -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure --prefix=/opt/gnome --libdir=/opt/gnome/%_lib -make +touch ChangeLog ; autoreconf -f -i +%configure +make %{?jobs:-j%jobs} cd ../gtk-smooth-engine* -%{?suse_update_config:%{suse_update_config -f}} -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ - ./configure --prefix=/opt/gnome --libdir=/opt/gnome/%_lib --enable-gtk-1=yes --enable-gtk-2=no -make +autoreconf -f -i +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +%configure\ + --enable-gtk-1=yes\ + --enable-gtk-2=no +make %{?jobs:-j%jobs} +unset CFLAGS cd ../ximian-artwork-0.6.1 -cp /usr/share/automake*/mkinstalldirs . -intltoolize --force -srcdir=$PWD autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=/opt/gnome --libdir=/opt/gnome/%_lib\ - --sysconfdir=/etc/opt/gnome \ +autoreconf -f -i +%configure\ --disable-static cd gtk/gtk1-engine -make +make %{?jobs:-j%jobs} %install -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall cd ../Xenophilia* -mkdir -p $RPM_BUILD_ROOT/opt/gnome/lib64/gtk/themes/engines -mkdir -p $RPM_BUILD_ROOT/opt/gnome/share/themes -make DESTDIR=$RPM_BUILD_ROOT install +mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk/themes/engines +mkdir -p $RPM_BUILD_ROOT%{_datadir}/themes +%makeinstall cd ../colorstep* -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall cd ../gtk-Mac2-theme -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall cd ../gtk-clean-theme -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall cd ../gtkstep* -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall cd ../newpsy -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall cd ../gtk-smooth-engine* -make DESTDIR=$RPM_BUILD_ROOT install -#mkdir -p $RPM_BUILD_ROOT/opt/gnome/share -#mv $RPM_BUILD_ROOT/usr/share/themes $RPM_BUILD_ROOT/opt/gnome/share +%makeinstall # these files are provided by gtk-engines2 cd ../ximian-artwork-0.6.1/gtk/gtk1-engine -make DESTDIR=$RPM_BUILD_ROOT install -rm $RPM_BUILD_ROOT/opt/gnome/share/themes/Metal/README.html -rm $RPM_BUILD_ROOT/opt/gnome/share/themes/Redmond95/README.html -rm $RPM_BUILD_ROOT/opt/gnome/%_lib/gtk/themes/engines/*.la +%makeinstall +rm $RPM_BUILD_ROOT%{_datadir}/themes/Metal/README.html +rm $RPM_BUILD_ROOT%{_datadir}/themes/Redmond95/README.html +rm $RPM_BUILD_ROOT%{_libdir}/gtk/themes/engines/*.la %clean rm -rf $RPM_BUILD_ROOT @@ -169,10 +162,14 @@ %files %defattr(-, root, root) %docdir %{_defaultdocdir}/%{name}/ -/opt/gnome/%_lib/gtk/themes/engines/* -/opt/gnome/share/themes/* +%{_libdir}/gtk/themes/engines/* +%{_datadir}/themes/* %changelog -n gtk-engines +* Mon Jan 22 2007 - sbrabec@suse.cz +- Prefix changed to /usr. +- Spec file cleanup. +- Fixed gcc warnings. * Mon Mar 13 2006 - sbrabec@suse.cz - Added Industrial engine from gnome-themes. * Wed Jan 25 2006 - mls@suse.de ++++++ gtkstep-automake.patch ++++++ --- Makefile.am 1999-09-13 17:55:04.000000000 +0200 +++ Makefile.am 2007-01-23 11:42:50.000000000 +0100 @@ -1,3 +1 @@ -ACLOCAL_AMFLAGS = -I /usr/local/share/aclocal - SUBDIRS = step ++++++ newpsy-automake.patch ++++++ --- Makefile.am 1999-09-13 17:55:04.000000000 +0200 +++ Makefile.am 2007-01-23 12:36:09.000000000 +0100 @@ -1,3 +1 @@ -ACLOCAL_AMFLAGS = -I /usr/local/share/aclocal - SUBDIRS = step ++++++ Xenophilia-1.2.x.patch ++++++ --- /var/tmp/diff_new_pack.DzL902/_old 2007-01-23 15:21:30.000000000 +0100 +++ /var/tmp/diff_new_pack.DzL902/_new 2007-01-23 15:21:30.000000000 +0100 @@ -50,6 +50,22 @@ #ifndef M_PI #define M_PI 3.14159265358979323846 +@@ -535,10 +535,14 @@ + || gc == style2->light_gc[GTK_STATE_INSENSITIVE] + || gc == style2->dark_gc[GTK_STATE_INSENSITIVE]) + { ++ GdkGC *gc2; ++ + if (style->klass->xthickness==1 || style->klass->ythickness==1) + return gc; + +- gdk_gc_copy(gc = gdk_gc_new(window), gc); ++ gc2 = gdk_gc_new(window); ++ gdk_gc_copy(gc2, gc); ++ gc = gc2; + gdk_gc_set_line_attributes (gc, 1, GDK_LINE_ON_OFF_DASH, 0, 0); + gdk_gc_set_dashes (gc, 0, "\1\1", 2); + } else { Index: xeno_theme_patches.c =================================================================== --- xeno_theme_patches.c.orig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org