December 2012 - openSUSE Commits - openSUSE Mailing Lists

commit valgrind for openSUSE:Factory
by root＠hilbert.suse.de 31 Dec '12

31 Dec '12

Hello community, here is the log from the commit of package valgrind for openSUSE:Factory checked in at 2012-12-31 19:32:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/valgrind (Old) and /work/SRC/openSUSE:Factory/.valgrind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "valgrind", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/valgrind/valgrind.changes 2012-12-31 14:26:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.valgrind.new/valgrind.changes 2012-12-31 19:32:41.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 31 14:26:31 UTC 2012 - idonmez(a)suse.com + +- Fix last patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valgrind-glibc-2.17.patch ++++++ --- /var/tmp/diff_new_pack.jFjLxD/_old 2012-12-31 19:32:42.000000000 +0100 +++ /var/tmp/diff_new_pack.jFjLxD/_new 2012-12-31 19:32:42.000000000 +0100 @@ -1,30 +1,18 @@ -Index: valgrind-3.8.1/configure +Index: valgrind-3.8.1/configure.in =================================================================== ---- valgrind-3.8.1.orig/configure -+++ valgrind-3.8.1/configure -@@ -6604,6 +6604,16 @@ $as_echo "#define GLIBC_2_16 1" >>confde +--- valgrind-3.8.1.orig/configure.in ++++ valgrind-3.8.1/configure.in +@@ -906,6 +906,13 @@ case "${GLIBC_VERSION}" in DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ;; + 2.17) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.16 family" >&5 -+$as_echo "2.17 family" >&6; } -+ -+$as_echo "#define GLIBC_2_17 1" >>confdefs.h -+ ++ AC_MSG_RESULT(2.17 family) ++ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x]) + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; ++ ;; darwin) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 - $as_echo "Darwin" >&6; } -@@ -6624,7 +6634,7 @@ $as_echo "#define BIONIC_LIBC 1" >>confd - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 - $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } -- as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5 -+ as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5 - as_fn_error "or Darwin libc" "$LINENO" 5 - ;; - esac + AC_MSG_RESULT(Darwin) + AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xscreensaver for openSUSE:Factory
by root＠hilbert.suse.de 31 Dec '12

31 Dec '12

Hello community, here is the log from the commit of package xscreensaver for openSUSE:Factory checked in at 2012-12-31 14:26:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xscreensaver (Old) and /work/SRC/openSUSE:Factory/.xscreensaver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xscreensaver", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver.changes 2012-09-23 17:12:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xscreensaver.new/xscreensaver.changes 2012-12-31 14:27:06.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Dec 26 04:28:59 UTC 2012 - andrea(a)opensuse.org + +- new upstream version 5.20 + * Made pipes be ridiculously less efficient, but spin. + * Added better mouse control to rubik, cube21, crackberg, and julia. + * Cosmetic improvements to queens and endgame. + * sonar can now ping local subnet on DHCP. + * Most savers now resize/rotate properly. + * Various fixes. + * Fixed some compilation problems. + * Enlarged the texture image for lament. + * XInput devices now also ignore small mouse motions. + * Loading images via RSS feeds is much improved. +- rebased xscreensaver-default-screensaver.patch and xscreensaver-stars.patch + to apply to new code + +------------------------------------------------------------------- Old: ---- xscreensaver-5.15.tar.gz New: ---- xscreensaver-5.20.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xscreensaver.spec ++++++ --- /var/tmp/diff_new_pack.EsoFcI/_old 2012-12-31 14:27:07.000000000 +0100 +++ /var/tmp/diff_new_pack.EsoFcI/_new 2012-12-31 14:27:07.000000000 +0100 @@ -39,7 +39,7 @@ Requires: desktop-data Requires: pam-modules Suggests: %{name}-data-extra -Version: 5.15 +Version: 5.20 Release: 0 Summary: A screen saver and locker for the X Window System License: BSD-3-Clause and GPL-2.0+ @@ -113,7 +113,7 @@ %patch5 %patch20 %patch21 -p1 -%patch23 +%patch23 -p1 # FIXME: Test, whether this patch is still needed: %patch24 %patch29 ++++++ xscreensaver-5.15.tar.gz -> xscreensaver-5.20.tar.gz ++++++ /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver-5.15.tar.gz /work/SRC/openSUSE:Factory/.xscreensaver.new/xscreensaver-5.20.tar.gz differ: char 5, line 1 ++++++ xscreensaver-default-screensaver.patch ++++++ --- /var/tmp/diff_new_pack.EsoFcI/_old 2012-12-31 14:27:07.000000000 +0100 +++ /var/tmp/diff_new_pack.EsoFcI/_new 2012-12-31 14:27:07.000000000 +0100 @@ -1,19 +1,6 @@ -modify default configuration -- do not grab images from desktop -- do not show error output of hacks -- ignore not installed hacks (they might disappear on update) -- set path to images to use -- display date + hostname in hacks requiring text input -- select default screensaver to use -- use DPMS by default -- do not display splash screen -- lock screen by default -- nice to 19 - -Index: xscreensaver-5.15/driver/XScreenSaver_ad.h -=================================================================== ---- xscreensaver-5.15.orig/driver/XScreenSaver_ad.h 2011-09-29 06:16:35.000000000 +0200 -+++ xscreensaver-5.15/driver/XScreenSaver_ad.h 2012-02-20 20:20:49.163666604 +0100 +diff -uNr old-xscreensaver-5.20/driver/XScreenSaver_ad.h xscreensaver-5.20/driver/XScreenSaver_ad.h +--- old-xscreensaver-5.20/driver/XScreenSaver_ad.h 2012-10-06 22:20:04.000000000 +0200 ++++ xscreensaver-5.20/driver/XScreenSaver_ad.h 2012-12-26 05:39:10.446124543 +0100 @@ -1,35 +1,36 @@ "#error Do not run app-defaults files through xrdb!", "#error That does not do what you might expect.", @@ -61,7 +48,7 @@ +"*ignoreUninstalledPrograms: True", +"*textMode: date", "*textLiteral: XScreenSaver", - "*textFile: /usr/X11/share/X11/doc/README.sgml", + "*textFile: ", "*textProgram: fortune", @@ -195,7 +196,7 @@ GL: gleidescope -root \\n\ @@ -72,10 +59,9 @@ GL: hypertorus -root \\n\ - GL: jigglypuff -root \\n\ metaballs -root \\n\ -Index: xscreensaver-5.15/driver/XScreenSaver.ad.in -=================================================================== ---- xscreensaver-5.15.orig/driver/XScreenSaver.ad.in 2011-09-28 12:54:58.000000000 +0200 -+++ xscreensaver-5.15/driver/XScreenSaver.ad.in 2012-02-20 20:20:49.162666651 +0100 +diff -uNr old-xscreensaver-5.20/driver/XScreenSaver.ad.in xscreensaver-5.20/driver/XScreenSaver.ad.in +--- old-xscreensaver-5.20/driver/XScreenSaver.ad.in 2012-10-06 22:04:17.000000000 +0200 ++++ xscreensaver-5.20/driver/XScreenSaver.ad.in 2012-12-26 05:39:10.446124543 +0100 @@ -28,37 +28,37 @@ ! /* (xrdb prevention kludge: whole file) @@ -123,7 +109,7 @@ *textLiteral: XScreenSaver *textFile: @DEFAULT_TEXT_FILE@ *textProgram: fortune -@@ -299,7 +299,7 @@ GetViewPortIsFullOfLies: False +@@ -300,7 +300,7 @@ @GL_KLUDGE@ GL: gleidescope -root \n\ @GL_KLUDGE@ GL: glknots -root \n\ @GL_KLUDGE@ GL: glmatrix -root \n\ ++++++ xscreensaver-stars.patch ++++++ --- /var/tmp/diff_new_pack.EsoFcI/_old 2012-12-31 14:27:07.000000000 +0100 +++ /var/tmp/diff_new_pack.EsoFcI/_new 2012-12-31 14:27:07.000000000 +0100 @@ -1,8 +1,19 @@ -Index: driver/XScreenSaver.ad.in -=================================================================== ---- driver/XScreenSaver.ad.in.orig 2012-02-20 20:20:41.102047422 +0100 -+++ driver/XScreenSaver.ad.in 2012-02-20 20:20:41.116046760 +0100 -@@ -410,7 +410,7 @@ XScreenSaver.bourneShell: /bin/sh +diff -uNr old-xscreensaver-5.20/driver/XScreenSaver_ad.h xscreensaver-5.20/driver/XScreenSaver_ad.h +--- old-xscreensaver-5.20/driver/XScreenSaver_ad.h 2012-10-06 22:20:04.000000000 +0200 ++++ xscreensaver-5.20/driver/XScreenSaver_ad.h 2012-12-26 05:47:48.149627326 +0100 +@@ -285,7 +285,7 @@ + "*passwd.login.label: New Login", + "*passwd.user.label: Username:", + "*passwd.thermometer.width: 8", +-"*passwd.asterisks: True", ++"*passwd.asterisks: False", + "*passwd.uname: True", + "*splash.heading.label: XScreenSaver %s", + "*splash.body.label: Copyright � 1991-2012 by", +diff -uNr old-xscreensaver-5.20/driver/XScreenSaver.ad.in xscreensaver-5.20/driver/XScreenSaver.ad.in +--- old-xscreensaver-5.20/driver/XScreenSaver.ad.in 2012-10-06 22:04:17.000000000 +0200 ++++ xscreensaver-5.20/driver/XScreenSaver.ad.in 2012-12-26 05:47:48.148627363 +0100 +@@ -411,7 +411,7 @@ *passwd.login.label: New Login *passwd.user.label: Username: *passwd.thermometer.width: 8 @@ -11,16 +22,3 @@ *passwd.uname: True *splash.heading.label: XScreenSaver %s -Index: driver/XScreenSaver_ad.h -=================================================================== ---- driver/XScreenSaver_ad.h.orig 2012-02-20 20:20:41.101047470 +0100 -+++ driver/XScreenSaver_ad.h 2012-02-20 20:20:41.116046760 +0100 -@@ -286,7 +286,7 @@ - "*passwd.login.label: New Login", - "*passwd.user.label: Username:", - "*passwd.thermometer.width: 8", --"*passwd.asterisks: True", -+"*passwd.asterisks: False", - "*passwd.uname: True", - "*splash.heading.label: XScreenSaver %s", - "*splash.body.label: Copyright � 1991-2010 by", -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit valgrind for openSUSE:Factory
by root＠hilbert.suse.de 31 Dec '12

31 Dec '12

Hello community, here is the log from the commit of package valgrind for openSUSE:Factory checked in at 2012-12-31 14:26:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/valgrind (Old) and /work/SRC/openSUSE:Factory/.valgrind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "valgrind", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/valgrind/valgrind.changes 2012-10-06 18:44:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.valgrind.new/valgrind.changes 2012-12-31 14:26:52.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 31 09:12:06 UTC 2012 - idonmez(a)suse.com + +- Add valgrind-glibc-2.17.patch to fix compilation with glibc 2.17 + +------------------------------------------------------------------- New: ---- valgrind-glibc-2.17.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valgrind.spec ++++++ --- /var/tmp/diff_new_pack.9mj8Mg/_old 2012-12-31 14:26:53.000000000 +0100 +++ /var/tmp/diff_new_pack.9mj8Mg/_new 2012-12-31 14:26:53.000000000 +0100 @@ -40,6 +40,7 @@ # svn di svn://svn.valgrind.org/vex/tags/VEX_3_5_0 svn://svn.valgrind.org/vex/branches/VEX_3_5_BRANCH > VEX_3_5_BRANCH.diff Patch1: jit-register-unregister.diff Patch2: raise-segnames-limit.diff +Patch3: valgrind-glibc-2.17.patch # during building the major version of glibc is built into the suppression file %define glibc_main_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f1) %define glibc_major_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f2) @@ -138,6 +139,7 @@ cd .. %patch1 %patch2 +%patch3 -p1 %build %ifarch %arm ++++++ valgrind-glibc-2.17.patch ++++++ Index: valgrind-3.8.1/configure =================================================================== --- valgrind-3.8.1.orig/configure +++ valgrind-3.8.1/configure @@ -6604,6 +6604,16 @@ $as_echo "#define GLIBC_2_16 1" >>confde DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ;; + 2.17) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.16 family" >&5 +$as_echo "2.17 family" >&6; } + +$as_echo "#define GLIBC_2_17 1" >>confdefs.h + + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; darwin) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 $as_echo "Darwin" >&6; } @@ -6624,7 +6634,7 @@ $as_echo "#define BIONIC_LIBC 1" >>confd *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } - as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5 + as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5 as_fn_error "or Darwin libc" "$LINENO" 5 ;; esac -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit smb4k for openSUSE:Factory
by root＠hilbert.suse.de 31 Dec '12

31 Dec '12

Hello community, here is the log from the commit of package smb4k for openSUSE:Factory checked in at 2012-12-31 14:26:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smb4k (Old) and /work/SRC/openSUSE:Factory/.smb4k.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "smb4k", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/smb4k/smb4k.changes 2012-09-17 01:29:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.smb4k.new/smb4k.changes 2012-12-31 14:26:43.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Dec 29 17:37:29 UTC 2012 - asterios.dramis(a)gmail.com + +- Update to version 1.0.5: + * Fixed hanging of Smb4K if a custom mount prefix without a trailing + slash was entered (closes SF ticket #28). + +------------------------------------------------------------------- Old: ---- smb4k-1.0.4.tar.bz2 New: ---- smb4k-1.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smb4k.spec ++++++ --- /var/tmp/diff_new_pack.PqVMvT/_old 2012-12-31 14:26:44.000000000 +0100 +++ /var/tmp/diff_new_pack.PqVMvT/_new 2012-12-31 14:26:44.000000000 +0100 @@ -17,7 +17,7 @@ Name: smb4k -Version: 1.0.4 +Version: 1.0.5 Release: 0 Summary: Advanced Network Neighborhood Browser for KDE License: GPL-2.0+ @@ -65,9 +65,7 @@ %make_jobs %install -cd build -%kde4_makeinstall -cd .. +%kde4_makeinstall -C build %if 0%{?suse_version} < 1220 echo "setBadness('suse-dbus-unauthorized-service', 0)" > $RPM_SOURCE_DIR/%name-rpmlintrc ++++++ smb4k-1.0.4.tar.bz2 -> smb4k-1.0.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.4/CMakeLists.txt new/smb4k-1.0.5/CMakeLists.txt --- old/smb4k-1.0.4/CMakeLists.txt 2012-08-19 11:00:02.000000000 +0200 +++ new/smb4k-1.0.5/CMakeLists.txt 2012-12-26 12:51:35.000000000 +0100 @@ -1,9 +1,9 @@ project( smb4k ) -set( VERSION 1.0.4 ) +set( VERSION 1.0.5 ) set( VERSION_MAJOR 1 ) set( VERSION_MINOR 0 ) -set( VERSION_PATCH 4 ) +set( VERSION_PATCH 5 ) cmake_minimum_required( VERSION 2.6 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.4/ChangeLog new/smb4k-1.0.5/ChangeLog --- old/smb4k-1.0.4/ChangeLog 2012-08-19 11:00:02.000000000 +0200 +++ new/smb4k-1.0.5/ChangeLog 2012-12-26 10:23:54.000000000 +0100 @@ -1,3 +1,8 @@ +Smb4K 1.0.5 (2012-12-26): +- Fixed hanging of Smb4K if a custom mount prefix without a trailing + slash was entered (closes SF ticket #28). Thanks go to Ettore Atalan + for reporting this issue and PhobosK for the patch. + Smb4K 1.0.4 (2012-08-19): - Fixed erroneously shown error notifications when searching. Thanks to Alexander Willand for reporting this issue. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.4/core/smb4kmounter_p.cpp new/smb4k-1.0.5/core/smb4kmounter_p.cpp --- old/smb4k-1.0.4/core/smb4kmounter_p.cpp 2012-08-19 11:00:02.000000000 +0200 +++ new/smb4k-1.0.5/core/smb4kmounter_p.cpp 2012-12-25 21:47:21.000000000 +0100 @@ -186,7 +186,7 @@ { KUrl u( dir.path() ); - while ( u != parentDirectory ) + while ( !parentDirectory.equals( u, KUrl::CompareWithoutTrailingSlash ) ) { QFile( u.path() ).setPermissions( permissions ); u = u.upUrl(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.4/svn-commit.tmp new/smb4k-1.0.5/svn-commit.tmp --- old/smb4k-1.0.4/svn-commit.tmp 1970-01-01 01:00:00.000000000 +0100 +++ new/smb4k-1.0.5/svn-commit.tmp 2012-07-28 17:43:06.000000000 +0200 @@ -0,0 +1,6 @@ +Wait until all shares have been unmounted on exit before closing down. +-- Diese und die folgenden Zeilen werden ignoriert -- + +M ChangeLog +M core/smb4kmounter.cpp +M core/CMakeLists.txt -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pv for openSUSE:Factory
by root＠hilbert.suse.de 31 Dec '12

31 Dec '12

Hello community, here is the log from the commit of package pv for openSUSE:Factory checked in at 2012-12-31 14:26:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pv (Old) and /work/SRC/openSUSE:Factory/.pv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pv", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/pv/pv.changes 2012-11-21 17:05:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pv.new/pv.changes 2012-12-31 14:26:34.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Dec 24 06:48:09 UTC 2012 - jengelh(a)inai.de + +- Update to new upstream release 1.4.4 +* fix crash when progress is displayed with too-small terminal +* new option --skip-errors +* new option --stop-at-size to stop after --size bytes +* autodetermine size if stdout is a block device +* fix a use-after-free bug + +------------------------------------------------------------------- Old: ---- pv-1.3.9.tar.bz2 pv-1.3.9.tar.bz2.asc New: ---- pv-1.4.4.tar.bz2 pv-1.4.4.tar.bz2.asc pv.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pv.spec ++++++ --- /var/tmp/diff_new_pack.yaEVl0/_old 2012-12-31 14:26:35.000000000 +0100 +++ /var/tmp/diff_new_pack.yaEVl0/_new 2012-12-31 14:26:35.000000000 +0100 @@ -17,7 +17,7 @@ Name: pv -Version: 1.3.9 +Version: 1.4.4 Release: 0 Summary: PipeViewer - Monitor the Progress of Data through Pipes License: Artistic-2.0 @@ -26,11 +26,15 @@ Source: http://www.ivarch.com/programs/sources/%name-%version.tar.bz2 Source2: %name-%version.tar.bz2.asc +Source3: %name.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc BuildRequires: gettext BuildRequires: gettext-devel BuildRequires: glibc-devel +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif BuildRequires: intltool BuildRequires: make @@ -42,6 +46,7 @@ will be until completion. %prep +%{?gpg_verify: %gpg_verify %{S:2}} %setup -q %build ++++++ pv-1.3.9.tar.bz2 -> pv-1.4.4.tar.bz2 ++++++ ++++ 6611 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mono-core for openSUSE:Factory
by root＠hilbert.suse.de 31 Dec '12

31 Dec '12

Hello community, here is the log from the commit of package mono-core for openSUSE:Factory checked in at 2012-12-31 14:26:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mono-core (Old) and /work/SRC/openSUSE:Factory/.mono-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mono-core", Maintainer is "orphaned(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/mono-core/mono-core.changes 2012-12-30 12:19:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mono-core.new/mono-core.changes 2012-12-31 14:26:24.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 27 17:52:57 UTC 2012 - dvaleev(a)suse.com + +- Fix ppc build failures (ppc.patch) + +------------------------------------------------------------------- New: ---- ppc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-core.spec ++++++ --- /var/tmp/diff_new_pack.0o7ucL/_old 2012-12-31 14:26:27.000000000 +0100 +++ /var/tmp/diff_new_pack.0o7ucL/_new 2012-12-31 14:26:27.000000000 +0100 @@ -39,6 +39,8 @@ Patch2: mono-arm-cpuinfo-v7.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch3: mono-arm-vfp.patch +# PATCH-FIX-OPENSUSE ppc.patch dvaleev(a)suse.com -- fix ppc build failures +Patch4: ppc.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: gcc-c++ @@ -112,6 +114,7 @@ %patch2 -p1 %patch3 -p1 %endif +%patch4 -p1 %build # These are only needed if there are patches to the runtime ++++++ ppc.patch ++++++ Index: mono-3.0.2/mono/mini/mini.c =================================================================== --- mono-3.0.2.orig/mono/mini/mini.c +++ mono-3.0.2/mono/mini/mini.c @@ -6240,7 +6240,7 @@ mini_create_ftnptr (MonoDomain *domain, desc [0] = addr; desc [1] = NULL; # elif defined(__ppc64__) || defined(__powerpc64__) - gpointer *desc; + //gpointer *desc; desc = mono_domain_alloc0 (domain, 3 * sizeof (gpointer)); Index: mono-3.0.2/mono/mini/mini-ppc.h =================================================================== --- mono-3.0.2.orig/mono/mini/mini-ppc.h +++ mono-3.0.2/mono/mini/mini-ppc.h @@ -96,6 +96,7 @@ typedef struct MonoCompileArch { #define MONO_ARCH_EMULATE_FREM 1 #define MONO_ARCH_BIGMUL_INTRINS 1 #define MONO_ARCH_HAVE_ATOMIC_CAS 1 +#define MONO_ARCH_GC_MAPS_SUPPORTED 1 /* Parameters used by the register allocator */ #define MONO_ARCH_CALLEE_REGS ((0xff << ppc_r3) | (1 << ppc_r11) | (1 << ppc_r12)) Index: mono-3.0.2/mono/mini/mini-gc.c =================================================================== --- mono-3.0.2.orig/mono/mini/mini-gc.c +++ mono-3.0.2/mono/mini/mini-gc.c @@ -438,6 +438,8 @@ static int callee_saved_regs [] = { X86_ static int callee_saved_regs [] = { ARMREG_V1, ARMREG_V2, ARMREG_V3, ARMREG_V4, ARMREG_V5, ARMREG_V7, ARMREG_FP }; #elif defined(TARGET_S390X) static int callee_saved_regs [] = { s390_r6, s390_r7, s390_r8, s390_r9, s390_r10, s390_r11, s390_r12, s390_r13, s390_r14 }; +#elif defined(TARGET_POWERPC) +static int callee_saved_regs [] = { ppc_r6, ppc_r7, ppc_r8, ppc_r9, ppc_r10, ppc_r11, ppc_r12, ppc_r13, ppc_r14 }; #endif static guint32 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mkinitrd for openSUSE:Factory
by root＠hilbert.suse.de 31 Dec '12

31 Dec '12

Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2012-12-31 14:26:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old) and /work/SRC/openSUSE:Factory/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkinitrd", Maintainer is "MMarek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2012-11-13 10:09:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2012-12-31 14:26:16.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Dec 17 16:07:27 UTC 2012 - mmarek(a)suse.cz + +- Fix typo in purge-kernels.service (bnc#792925). + +------------------------------------------------------------------- +Fri Dec 7 05:16:54 CET 2012 - jlee(a)suse.com + +- mkinitrd: copy firmware signature files to initrd (fate#314574). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/etc/purge-kernels.service new/mkinitrd-2.7.2/etc/purge-kernels.service --- old/mkinitrd-2.7.2/etc/purge-kernels.service 2012-11-09 18:38:03.000000000 +0100 +++ new/mkinitrd-2.7.2/etc/purge-kernels.service 2012-12-17 17:11:40.000000000 +0100 @@ -1,11 +1,11 @@ [Unit] Description=Purge old kernels After=local_fs.target -ConditionPathExists=/boot/do_pure_kernels +ConditionPathExists=/boot/do_purge_kernels [Service] Type=oneshot -ExecStartPre=/bin/rm -f /boot/do_pure_kernels +ExecStartPre=/bin/rm -f /boot/do_purge_kernels ExecStart=/sbin/purge-kernels [Install] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes new/mkinitrd-2.7.2/mkinitrd.changes --- old/mkinitrd-2.7.2/mkinitrd.changes 2012-11-09 18:38:03.000000000 +0100 +++ new/mkinitrd-2.7.2/mkinitrd.changes 2012-12-17 17:11:40.000000000 +0100 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Mon Dec 17 16:07:27 UTC 2012 - mmarek(a)suse.cz + +- Fix typo in purge-kernels.service (bnc#792925). + +------------------------------------------------------------------- +Fri Dec 7 05:16:54 CET 2012 - jlee(a)suse.com + +- mkinitrd: copy firmware signature files to initrd (fate#314574). + +------------------------------------------------------------------- Fri Nov 9 18:37:49 CET 2012 - ohering(a)suse.de - Version 2.7.2. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/sbin/lsinitrd new/mkinitrd-2.7.2/sbin/lsinitrd --- old/mkinitrd-2.7.2/sbin/lsinitrd 2012-11-09 18:38:03.000000000 +0100 +++ new/mkinitrd-2.7.2/sbin/lsinitrd 2012-12-17 17:11:40.000000000 +0100 @@ -23,7 +23,8 @@ echo "Usage: lsinitrd [-l] [-h] [-c] <initrd>" } -config=0 +verbose= +config= while [ "$1" ] ; do case $1 in -l|--long) @@ -76,7 +77,7 @@ args="-t" fi -if [ "$config" -eq 1 ] ; then +if [ "$config" ] ; then # yes, that's snow, but doesn't use any temporary files :) for configfile in $(uncomp $initrd | exec cpio --quiet -t | exec grep '^config/') ; do echo "=========> $configfile <============" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-modules.sh new/mkinitrd-2.7.2/scripts/setup-modules.sh --- old/mkinitrd-2.7.2/scripts/setup-modules.sh 2012-11-09 18:38:03.000000000 +0100 +++ new/mkinitrd-2.7.2/scripts/setup-modules.sh 2012-12-17 17:11:40.000000000 +0100 @@ -341,6 +341,10 @@ has_firmware=true fi echo -n "$fw " + if test -e "$dir/$subdir/$fw.sig"; then + cp -p --parents "$_" "$tmp_mnt" + echo -n "$fw.sig " + fi fi done done -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit LibVNCServer for openSUSE:Factory
by root＠hilbert.suse.de 31 Dec '12

31 Dec '12

Hello community, here is the log from the commit of package LibVNCServer for openSUSE:Factory checked in at 2012-12-31 14:25:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/LibVNCServer (Old) and /work/SRC/openSUSE:Factory/.LibVNCServer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "LibVNCServer", Maintainer is "orphaned(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/LibVNCServer/LibVNCServer.changes 2012-10-26 17:13:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.LibVNCServer.new/LibVNCServer.changes 2012-12-31 14:26:03.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Dec 30 22:02:37 UTC 2012 - crrodriguez(a)opensuse.org + +- libvncserver-byteswap.patch : USe OS byteswapping macros + which are optimized for the target arch. + +- BuildRequire libpng-Devel + +------------------------------------------------------------------- New: ---- libvncserver-byteswap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ LibVNCServer.spec ++++++ --- /var/tmp/diff_new_pack.3Qstx2/_old 2012-12-31 14:26:04.000000000 +0100 +++ /var/tmp/diff_new_pack.3Qstx2/_new 2012-12-31 14:26:04.000000000 +0100 @@ -17,12 +17,12 @@ Name: LibVNCServer -BuildRequires: autoconf -BuildRequires: automake BuildRequires: gnutls-devel BuildRequires: libavahi-devel BuildRequires: libgcrypt-devel BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtool BuildRequires: lzo-devel BuildRequires: slang-devel BuildRequires: xorg-x11-devel @@ -41,6 +41,8 @@ Patch7: redef-keysym.patch #PATCH-FIX-OPENSUSE: disable x11vnc build Patch10: LibVNCServer-0.9.9-no_x11vnc.patch +#PATCH_FIX-OPENSUSE: Use system fast byteswap routines. +Patch11: libvncserver-byteswap.patch %description VNC is a set of programs using the RFB (Remote Frame Buffer) protocol. @@ -84,7 +86,7 @@ # aclocal; autoheader; automake --add-missing --copy; autoconf # ./configure --enable-maintainer-mode # sh ./autogen.sh - +%patch11 # fix encoding for file in AUTHORS ChangeLog ; do mv ${file} ${file}.OLD && \ @@ -99,12 +101,10 @@ #autoreconf %build -CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT" \ +CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_REENTRANT" \ # Plase note that tightvn cause a problem; need to be fix %configure --disable-static --with-pic --enable-shared --with-gnu-ld --prefix=%{_prefix} --without-tightvnc-filetransfer -# hack to omit unused-direct-shlib-dependencies -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} ++++++ libvncserver-byteswap.patch ++++++ --- rfb/rfb.h.orig +++ rfb/rfb.h @@ -711,19 +711,18 @@ typedef struct _rfbClientRec { ((cl)->enableCursorPosUpdates && (cl)->cursorWasMoved) || \ !sraRgnEmpty((cl)->copyRegion) || !sraRgnEmpty((cl)->modifiedRegion)) +#include <byteswap.h> /* * Macros for endian swapping. */ -#define Swap16(s) ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) +#define Swap16(s) bswap_16(s) #define Swap24(l) ((((l) & 0xff) << 16) | (((l) >> 16) & 0xff) | \ (((l) & 0x00ff00))) -#define Swap32(l) (((l) >> 24) | \ - (((l) & 0x00ff0000) >> 8) | \ - (((l) & 0x0000ff00) << 8) | \ - ((l) << 24)) +#define Swap32(l) bswap_32(l) + extern char rfbEndianTest; --- rfb/rfbclient.h.orig +++ rfb/rfbclient.h @@ -38,25 +38,16 @@ #include <unistd.h> #include <rfb/rfbproto.h> #include <rfb/keysym.h> +#include <byteswap.h> #define rfbClientSwap16IfLE(s) \ - (*(char *)&client->endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s)) + (*(char *)&client->endianTest ? (bswap_16(s)) : (s)) #define rfbClientSwap32IfLE(l) \ - (*(char *)&client->endianTest ? ((((l) & 0xff000000) >> 24) | \ - (((l) & 0x00ff0000) >> 8) | \ - (((l) & 0x0000ff00) << 8) | \ - (((l) & 0x000000ff) << 24)) : (l)) + (*(char *)&client->endianTest ? (bswap_32(l)) : (l)) #define rfbClientSwap64IfLE(l) \ - (*(char *)&client->endianTest ? ((((l) & 0xff00000000000000ULL) >> 56) | \ - (((l) & 0x00ff000000000000ULL) >> 40) | \ - (((l) & 0x0000ff0000000000ULL) >> 24) | \ - (((l) & 0x000000ff00000000ULL) >> 8) | \ - (((l) & 0x00000000ff000000ULL) << 8) | \ - (((l) & 0x0000000000ff0000ULL) << 24) | \ - (((l) & 0x000000000000ff00ULL) << 40) | \ - (((l) & 0x00000000000000ffULL) << 56)) : (l)) + (*(char *)&client->endianTest ? (bswap_64(l)): (l)) #define FLASH_PORT_OFFSET 5400 #define LISTEN_PORT_OFFSET 5500 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libvirt-cim for openSUSE:Factory
by root＠hilbert.suse.de 31 Dec '12

31 Dec '12

Hello community, here is the log from the commit of package libvirt-cim for openSUSE:Factory checked in at 2012-12-31 14:25:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt-cim (Old) and /work/SRC/openSUSE:Factory/.libvirt-cim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt-cim", Maintainer is "JFEHLIG(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt-cim/libvirt-cim.changes 2012-08-07 21:50:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt-cim.new/libvirt-cim.changes 2012-12-31 14:25:54.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 28 18:03:51 UTC 2012 - dvaleev(a)suse.com + +- use macro for restart on update + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt-cim.spec ++++++ --- /var/tmp/diff_new_pack.W2mhIq/_old 2012-12-31 14:25:55.000000000 +0100 +++ /var/tmp/diff_new_pack.W2mhIq/_new 2012-12-31 14:25:55.000000000 +0100 @@ -110,7 +110,7 @@ %post /sbin/ldconfig %{_datadir}/%{name}/install_base_schema.sh %{_datadir}/%{name} -/etc/init.d/sfcb restart +%restart_on_update sfcb %{_datadir}/%{name}/provider-register.sh -t sfcb \ -n root/virt \ -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde-gtk-config for openSUSE:Factory
by root＠hilbert.suse.de 31 Dec '12

31 Dec '12

Hello community, here is the log from the commit of package kde-gtk-config for openSUSE:Factory checked in at 2012-12-31 14:25:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde-gtk-config (Old) and /work/SRC/openSUSE:Factory/.kde-gtk-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kde-gtk-config", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kde-gtk-config/kde-gtk-config.changes 2012-12-10 17:16:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kde-gtk-config.new/kde-gtk-config.changes 2012-12-31 14:25:53.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Dec 29 21:50:35 UTC 2012 - asterios.dramis(a)gmail.com + +- Added default templates for GTK2 and GTK3 settings. Updated the + kde_gtk_config.suse.sh startup script accordingly. +- Added gtk2-theme-oxygen and gtk3-theme-oxygen Suggests: entries. + +------------------------------------------------------------------- New: ---- gtk3-settings.ini-kde4.template gtkrc-2.0-kde4.template ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde-gtk-config.spec ++++++ --- /var/tmp/diff_new_pack.0aQxyM/_old 2012-12-31 14:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.0aQxyM/_new 2012-12-31 14:25:54.000000000 +0100 @@ -25,6 +25,8 @@ Url: https://projects.kde.org/projects/playground/base/kde-gtk-config/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{name}/%{version}/src/%{name}-%{version}.… Source1: kde_gtk_config.suse.sh +Source2: gtkrc-2.0-kde4.template +Source3: gtk3-settings.ini-kde4.template BuildRequires: atk-devel BuildRequires: cairo-devel BuildRequires: gdk-pixbuf-devel @@ -34,6 +36,8 @@ BuildRequires: pango-devel %kde4_runtime_requires Recommends: %{name}-lang = %{version} +Suggests: gtk2-theme-oxygen +Suggests: gtk3-theme-oxygen Obsoletes: kcm_gtk BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,9 +63,10 @@ %install %kde4_makeinstall -C build -### Taken from kcm_gtk -mkdir -p %{buildroot}%{_kde4_sharedir}/env -install -D -m 0755 %{SOURCE1} %{buildroot}%{_kde4_sharedir}/env/ + +install -Dpm 0755 %{SOURCE1} %{buildroot}%{_kde4_sharedir}/env/kde_gtk_config.suse.sh +install -Dpm 0644 %{SOURCE2} %{buildroot}%{_kde4_appsdir}/%{name}/gtkrc-2.0-kde4.template +install -Dpm 0644 %{SOURCE3} %{buildroot}%{_kde4_appsdir}/%{name}/gtk3-settings.ini-kde4.template %kde_post_install @@ -71,6 +76,7 @@ %defattr(-,root,root,-) %doc COPYING ChangeLog README %{_kde4_appsdir}/kcm-gtk-module/ +%{_kde4_appsdir}/kde-gtk-config/ %{_kde4_bindir}/gtk_preview %{_kde4_bindir}/gtk3_preview %{_kde4_bindir}/reload_gtk_apps ++++++ gtk3-settings.ini-kde4.template ++++++ [Settings] gtk-font-name=Sans Serif 9 gtk-theme-name=@@THEME_NAME@@ gtk-icon-theme-name=oxygen gtk-fallback-icon-theme=gnome gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ gtk-menu-images=1 gtk-button-images=1 ++++++ gtkrc-2.0-kde4.template ++++++ include "/usr/share/themes/@@THEME_NAME@@/gtk-2.0/gtkrc" include "/etc/gtk-2.0/gtkrc" style "user-font" { font_name="Sans Serif" } widget_class "*" style "user-font" gtk-font-name="Sans Serif 9" gtk-theme-name="@@THEME_NAME@@" gtk-icon-theme-name="oxygen" gtk-fallback-icon-theme="gnome" gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ gtk-menu-images=1 gtk-button-images=1 ++++++ kde_gtk_config.suse.sh ++++++ --- /var/tmp/diff_new_pack.0aQxyM/_old 2012-12-31 14:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.0aQxyM/_new 2012-12-31 14:25:54.000000000 +0100 @@ -1,35 +1,47 @@ #!/bin/bash -# Defaults for openSUSE 10.3 +# Defaults for openSUSE GTK2_SYSCONFDIR=/etc GTK2_DATADIR=/usr/share/themes/ +GTK3_HOME_CONFDIR="$HOME/.config/gtk-3.0" +GTK3_DATADIR=/usr/share/themes/ -# file used by kcm_gtk -GTK2_THEME_RC="$HOME/.gtkrc-2.0-kde4" +# Files used by kde-gtk-config +GTK2_THEME_RC="$HOME/.gtkrc-2.0" +GTK3_THEME_RC="$HOME/.config/gtk-3.0/settings.ini" # GTK2 -# NOTE: ~/.gtkrc-2.0-kde is added later (in latest KDE only) if [ "$GTK2_RC_FILES" ]; then - export GTK2_RC_FILES="$GTK2_RC_FILES:$GTK2_THEME_RC:$HOME/.gtkrc-2.0-qtengine:$HOME/.gtkrc-2.0" + export GTK2_RC_FILES="$GTK2_RC_FILES:$GTK2_THEME_RC" else - export GTK2_RC_FILES="$GTK2_SYSCONFDIR/gtk-2.0/gtkrc:$GTK2_THEME_RC:$HOME/.gtkrc-2.0-qtengine:$HOME/.gtkrc-2.0" + export GTK2_RC_FILES="$GTK2_SYSCONFDIR/gtk-2.0/gtkrc:$GTK2_THEME_RC" fi -# create the file if it doesn't exit +# Create the file if it doesn't exist if [ ! -e "$GTK2_THEME_RC" ]; then # oxygen-gtk, the default if [ -e "$GTK2_DATADIR/oxygen-gtk/gtk-2.0/gtkrc" ] ; then THEME="oxygen-gtk" + # else use QtCurve engine elif [ -e "$GTK2_DATADIR/QtCurve/gtk-2.0/gtkrc" ] ; then - # use QtCurve engine THEME="QtCurve" - elif [ -e "$GTK2_DATADIR/Qt/gtk-2.0/gtkrc" ] ; then - # use general gtk-qt-engine - THEME="Qt" fi if [ -n "$THEME" ]; then - cp -f /usr/share/kde4/apps/kcm_gtk/gtkrc-2.0-kde4.template "$GTK2_THEME_RC" + cp -f /usr/share/kde4/apps/kde-gtk-config/gtkrc-2.0-kde4.template "$GTK2_THEME_RC" sed -i -e "s,@@THEME_NAME@@,$THEME," "$GTK2_THEME_RC" fi fi +# GTK3 +# Create the file if it doesn't exist +if [ ! -e "$GTK3_THEME_RC" ]; then + # oxygen-gtk, the default + if [ -e "$GTK3_DATADIR/oxygen-gtk/gtk-3.0/oxygenrc" ] ; then + THEME="oxygen-gtk" + fi + if [ -n "$THEME" ]; then + mkdir -p "$GTK3_HOME_CONFDIR" + cp -f /usr/share/kde4/apps/kde-gtk-config/gtk3-settings.ini-kde4.template "$GTK3_THEME_RC" + sed -i -e "s,@@THEME_NAME@@,$THEME," "$GTK3_THEME_RC" + fi +fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0