October 2014 - openSUSE Commits - openSUSE Mailing Lists

commit mate-power-manager for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package mate-power-manager for openSUSE:Factory checked in at 2014-10-05 20:31:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-power-manager (Old) and /work/SRC/openSUSE:Factory/.mate-power-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-power-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-power-manager/mate-power-manager.changes 2014-04-26 10:06:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mate-power-manager.new/mate-power-manager.changes 2014-10-05 20:33:30.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Oct 3 15:05:42 UTC 2014 - p.drouand(a)gmail.com + +- Update to version 1.8.1 + + Fixed "levels is 0" warning if no kbd backlight present + + Added support for upower-0.99 API + + Added keywords key to .desktop file + + Removed "battery recall" logic +- Remove upstreamed patches + + mate-power-manager-avoid-levels_is_0-warning.patch + + mate-power-manager-port-to-upower-0.99_API.patch + + mate-power-manager-remove-battery-recall-logic.patch + + mate-power-manager-fixes-for-upower1-api-changes.patch + + mate-power-manager-improve-upower1-support.patch + +------------------------------------------------------------------- Old: ---- mate-power-manager-1.8.0.tar.xz mate-power-manager-avoid-levels_is_0-warning.patch mate-power-manager-fixes-for-upower1-api-changes.patch mate-power-manager-improve-upower1-support.patch mate-power-manager-port-to-upower-0.99_API.patch mate-power-manager-remove-battery-recall-logic.patch New: ---- mate-power-manager-1.8.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.FdhVA1/_old 2014-10-05 20:33:31.000000000 +0200 +++ /var/tmp/diff_new_pack.FdhVA1/_new 2014-10-05 20:33:31.000000000 +0200 @@ -16,7 +16,7 @@ # Name: mate-power-manager -Version: 1.8.0 +Version: 1.8.1 Release: 0 Summary: MATE Desktop UPower policy management License: GPL-2.0 @@ -26,18 +26,6 @@ # PATCH-FIX-UPSTREAM mate-power-manager_dbus_interface_keyboard_backlight_controls.patch --fix gsettings schema # to fix keyboard backlight support Patch0: mate-power-manager_dbus_interface_keyboard_backlight_controls.patch -# PATCH-FIX-UPSTREAM mate-power-manager-avoid-levels_is_0-warning.patch --avoid "levels is 0" warning if no -# kbd backlight present -Patch1: mate-power-manager-avoid-levels_is_0-warning.patch -# PATCH-FIX-UPSTREAM mate-power-manager-port-to-upower-0.99_API.patch --fix mate-power-manager for current upower versions -Patch2: mate-power-manager-port-to-upower-0.99_API.patch -# PATCH-FIX-UPSTREAM mate-power-manager-remove-battery-recall-logic.patch --the database is outdated several years -# now and the whole interface is removed from current UPower release -Patch3: mate-power-manager-remove-battery-recall-logic.patch -# PATCH-FIX-UPSTREAM mate-power-manager-fixes-for-upower1-api-changes.patch --adapt upstream code to API changes -Patch4: mate-power-manager-fixes-for-upower1-api-changes.patch -# PATCH-FIX-UPSTREAM mate-power-manager-improve-upower1-support.patch --fix support of devices for upower >=1.0 -Patch5: mate-power-manager-improve-upower1-support.patch Requires: upower Recommends: %{name}-lang %glib2_gsettings_schema_requires @@ -68,11 +56,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch3 -p1 -%patch2 -p1 -%patch5 -p1 -%patch4 -p1 %build autoreconf -fiv @@ -105,8 +88,8 @@ %doc AUTHORS README COPYING %dir %{_datadir}/mate-2.0 %{_sysconfdir}/xdg/autostart/mate-power-manager.desktop -%{_bindir}/mate-power-bugreport.sh %{_bindir}/mate-power-manager +%{_bindir}/mate-power-manager-bugreport %{_bindir}/mate-power-preferences %{_bindir}/mate-power-statistics %{_sbindir}/mate-power-backlight-helper ++++++ mate-power-manager-1.8.0.tar.xz -> mate-power-manager-1.8.1.tar.xz ++++++ ++++ 3062 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/ChangeLog new/mate-power-manager-1.8.1/ChangeLog --- old/mate-power-manager-1.8.0/ChangeLog 2014-03-01 17:54:49.000000000 +0100 +++ new/mate-power-manager-1.8.1/ChangeLog 2014-09-29 21:45:34.000000000 +0200 @@ -1,5 +1,139 @@ # Generated by Makefile. Do not edit. +commit 170a95ae62dbf72bbffc99fc5796cb22dc418131 +Author: infirit <infirit(a)gmail.com> +Date: Sun Sep 28 21:33:32 2014 +0200 + + Bump version to 1.8.1 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1e08af4d0414173d13e0ffea225e24389e9b3e04 +Author: infirit <infirit(a)gmail.com> +Date: Sun Sep 28 21:33:14 2014 +0200 + + Update NEWS for 1.8.1 + + NEWS | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit a8d1e0e1df27b074c7b64141b34a6d668cb3757c +Author: infirit <infirit(a)gmail.com> +Date: Sun May 11 21:29:10 2014 +0200 + + Fix typo in Makefile.am + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 051ab600d9bd485d756f53c220b07df2450e1fc2 +Author: infirit <infirit(a)gmail.com> +Date: Wed Apr 30 20:02:31 2014 +0200 + + Update vendor_url in policy file + + policy/org.mate.power.policy.in2 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 928131e0eb2fc199663adb21b276ac0128ac4852 +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Date: Thu Apr 24 22:27:48 2014 +0200 + + Add keywords key to .desktop file + + Closes https://github.com/mate-desktop/mate-power-manager/issues/100 + + data/mate-power-preferences.desktop.in.in | 1 + + 1 file changed, 1 insertion(+) + +commit d7e65732bc37970ad2f6f31b087077563df6b10f +Author: Stefano Karapetsas <stefano(a)karapetsas.com> +Date: Thu Apr 24 20:33:44 2014 +0200 + + Rename mate-power-bugreport.sh -> tools/mate-power-manager-bugreport + + Closes https://github.com/mate-desktop/mate-power-manager/issues/101 + + tools/Makefile.am | 2 +- + tools/mate-power-bugreport.sh | 90 -------------------------------------- + tools/mate-power-manager-bugreport | 90 ++++++++++++++++++++++++++++++++++++++ + 3 files changed, 91 insertions(+), 91 deletions(-) + +commit 55e46db47c6ebef7cc942fa3d8ad4f42e6885847 +Author: Stefano Karapetsas <stefano(a)karapetsas.com> +Date: Thu Apr 24 20:25:35 2014 +0200 + + Remove autogenerated file + + Closes https://github.com/mate-desktop/mate-power-manager/issues/103 + + m4/ltsugar.m4 | 123 ---------------------------------------------------------- + 1 file changed, 123 deletions(-) + +commit 546c2de75769328028c6acca38ddfd30533855e3 +Author: Stefano Karapetsas <stefano(a)karapetsas.com> +Date: Thu Apr 24 20:19:01 2014 +0200 + + Other round of fixes for UPower 0.99 API changes + + src/gpm-engine.c | 85 ++++++++++++++++++++++++++++++++++++++++++------------- + src/gpm-manager.c | 4 ++- + 2 files changed, 68 insertions(+), 21 deletions(-) + +commit 4ce6c0b93a2f57cfa2cf418eda42cdeaab39b09a +Author: Stefano Karapetsas <stefano(a)karapetsas.com> +Date: Thu Apr 24 18:17:35 2014 +0200 + + Improve UPower1 support + + src/gpm-engine.c | 32 +++++++++++++++++++++++--------- + 1 file changed, 23 insertions(+), 9 deletions(-) + +commit b0df99fa2eb1d7c9eed7e1424bffd6848382a79c +Author: Stefan Seyfried <seife+dev(a)b1-systems.com> +Date: Wed Apr 9 15:12:17 2014 +0200 + + port mate-power-manager to upower-0.99 API + + fix mate-power-manager for current upower versions + + src/gpm-backlight.c | 9 ++++++++ + src/gpm-button.c | 10 ++++++++- + src/gpm-control.c | 6 ++++-- + src/gpm-engine.c | 55 +++++++++++++++++++++++++++++++++++++++++++++---- + src/gpm-kbd-backlight.c | 8 +++++++ + src/gpm-manager.c | 9 ++++++++ + src/gpm-prefs-core.c | 8 +++++-- + src/gpm-statistics.c | 17 +++++++++++++-- + 8 files changed, 111 insertions(+), 11 deletions(-) + +commit 5d70266e4ee075f001a0827ef4060eb8abf882ba +Author: Stefan Seyfried <seife+dev(a)b1-systems.com> +Date: Wed Apr 9 14:58:29 2014 +0200 + + remove "battery recall" logic + + the database is outdated several years now and the whole interface is + removed from current UPower release anyway, so let's get rid of it in + m-p-m, too + + data/org.mate.power-manager.gschema.xml.in | 5 -- + src/gpm-common.h | 1 - + src/gpm-engine.c | 47 ------------- + src/gpm-engine.h | 4 -- + src/gpm-manager.c | 108 ----------------------------- + 5 files changed, 165 deletions(-) + +commit ae55a4276c29ba7377fbb79a0e451eb9365f6f37 +Author: Stefan Seyfried <seife+dev(a)b1-systems.com> +Date: Wed Apr 9 14:43:44 2014 +0200 + + avoid "levels is 0" warning if no kbd backlight present + + src/gpm-kbd-backlight.c | 3 +++ + 1 file changed, 3 insertions(+) + commit 079471200ad1b05952ea1bef5c65979f552134b6 Author: Stefano Karapetsas <stefano(a)karapetsas.com> Date: Sat Mar 1 12:41:07 2014 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/Makefile.am new/mate-power-manager-1.8.1/Makefile.am --- old/mate-power-manager-1.8.0/Makefile.am 2014-02-18 21:46:04.000000000 +0100 +++ new/mate-power-manager-1.8.1/Makefile.am 2014-05-11 21:28:36.000000000 +0200 @@ -1,5 +1,5 @@ -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAG} +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = \ src \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/NEWS new/mate-power-manager-1.8.1/NEWS --- old/mate-power-manager-1.8.0/NEWS 2014-03-01 12:41:02.000000000 +0100 +++ new/mate-power-manager-1.8.1/NEWS 2014-09-28 21:33:11.000000000 +0200 @@ -1,3 +1,15 @@ +Version 1.8.1 +~~~~~~~~~~~~~ +Released 2014-09-28 + +* News + - Port mate-power-manager to upower-0.99 API + +* Bug fixes + - Avoid "levels is 0" warning if no kbd backlight present + - Remove "battery recall" logic + - Add keywords key to .desktop file + Version 1.8.0 ~~~~~~~~~~~~~ Released: 2014-03-01 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/configure.ac new/mate-power-manager-1.8.1/configure.ac --- old/mate-power-manager-1.8.0/configure.ac 2014-03-01 12:40:51.000000000 +0100 +++ new/mate-power-manager-1.8.1/configure.ac 2014-09-28 21:33:26.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ(2.63) -AC_INIT([mate-power-manager], [1.8.0], [http://www.mate-desktop.org/]) +AC_INIT([mate-power-manager], [1.8.1], [http://www.mate-desktop.org/]) AC_CONFIG_SRCDIR(src) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz check-news tar-ustar]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/data/mate-power-manager.desktop.in new/mate-power-manager-1.8.1/data/mate-power-manager.desktop.in --- old/mate-power-manager-1.8.0/data/mate-power-manager.desktop.in 2014-03-01 17:54:13.000000000 +0100 +++ new/mate-power-manager-1.8.1/data/mate-power-manager.desktop.in 2014-09-29 21:44:30.000000000 +0200 @@ -10,7 +10,7 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=mate-power-manager X-MATE-Bugzilla-Component=mate-power-manager -X-MATE-Bugzilla-Version=1.8.0 +X-MATE-Bugzilla-Version=1.8.1 X-MATE-Bugzilla-ExtraInfoScript=mate-power-bugreport.sh #X-MATE-AutoRestart=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/data/mate-power-preferences.desktop.in new/mate-power-manager-1.8.1/data/mate-power-preferences.desktop.in --- old/mate-power-manager-1.8.0/data/mate-power-preferences.desktop.in 2014-03-01 17:54:13.000000000 +0100 +++ new/mate-power-manager-1.8.1/data/mate-power-preferences.desktop.in 2014-09-29 21:44:30.000000000 +0200 @@ -6,10 +6,11 @@ Terminal=false Type=Application Categories=Settings;HardwareSettings; +Keywords=MATE;power;management;preferences;settings; OnlyShowIn=MATE; StartupNotify=true X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=mate-power-manager X-MATE-Bugzilla-Component=mate-power-preferences -X-MATE-Bugzilla-Version=1.8.0 +X-MATE-Bugzilla-Version=1.8.1 X-MATE-Bugzilla-ExtraInfoScript=mate-power-bugreport.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/data/mate-power-preferences.desktop.in.in new/mate-power-manager-1.8.1/data/mate-power-preferences.desktop.in.in --- old/mate-power-manager-1.8.0/data/mate-power-preferences.desktop.in.in 2013-03-15 21:03:43.000000000 +0100 +++ new/mate-power-manager-1.8.1/data/mate-power-preferences.desktop.in.in 2014-04-30 20:01:53.000000000 +0200 @@ -6,6 +6,7 @@ Terminal=false Type=Application Categories=Settings;HardwareSettings; +Keywords=MATE;power;management;preferences;settings; OnlyShowIn=MATE; StartupNotify=true X-MATE-Bugzilla-Bugzilla=MATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/data/mate-power-statistics.desktop.in new/mate-power-manager-1.8.1/data/mate-power-statistics.desktop.in --- old/mate-power-manager-1.8.0/data/mate-power-statistics.desktop.in 2014-03-01 17:54:13.000000000 +0100 +++ new/mate-power-manager-1.8.1/data/mate-power-statistics.desktop.in 2014-09-29 21:44:30.000000000 +0200 @@ -12,5 +12,5 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=mate-power-manager X-MATE-Bugzilla-Component=mate-power-statistics -X-MATE-Bugzilla-Version=1.8.0 +X-MATE-Bugzilla-Version=1.8.1 X-Desktop-File-Install-Version=0.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/data/org.mate.power-manager.gschema.xml new/mate-power-manager-1.8.1/data/org.mate.power-manager.gschema.xml --- old/mate-power-manager-1.8.0/data/org.mate.power-manager.gschema.xml 2014-03-01 17:54:25.000000000 +0100 +++ new/mate-power-manager-1.8.1/data/org.mate.power-manager.gschema.xml 2014-05-15 00:27:54.000000000 +0200 @@ -212,11 +212,6 @@ <summary>Seconds of inactivity to spin down when on battery</summary> <description>The number of seconds of inactivity to spin down the disks when on battery power.</description> </key> - <key type="b" name="notify-perhaps-recall"> - <default>true</default> - <summary>If we should show the recalled battery warning for a broken battery</summary> - <description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</description> - </key> <key type="b" name="notify-low-capacity"> <default>true</default> <summary>If we should show the low capacity warning for a broken battery</summary> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/data/org.mate.power-manager.gschema.xml.in new/mate-power-manager-1.8.1/data/org.mate.power-manager.gschema.xml.in --- old/mate-power-manager-1.8.0/data/org.mate.power-manager.gschema.xml.in 2014-01-20 19:40:23.000000000 +0100 +++ new/mate-power-manager-1.8.1/data/org.mate.power-manager.gschema.xml.in 2014-04-30 20:01:53.000000000 +0200 @@ -211,11 +211,6 @@ <_summary>Seconds of inactivity to spin down when on battery</_summary> <_description>The number of seconds of inactivity to spin down the disks when on battery power.</_description> </key> - <key name="notify-perhaps-recall" type="b"> - <default>true</default> - <_summary>If we should show the recalled battery warning for a broken battery</_summary> - <_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description> - </key> <key name="notify-low-capacity" type="b"> <default>true</default> <_summary>If we should show the low capacity warning for a broken battery</_summary> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/m4/intltool.m4 new/mate-power-manager-1.8.1/m4/intltool.m4 --- old/mate-power-manager-1.8.0/m4/intltool.m4 2014-03-01 17:53:58.000000000 +0100 +++ new/mate-power-manager-1.8.1/m4/intltool.m4 2014-09-29 21:44:16.000000000 +0200 @@ -155,31 +155,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile AC_SUBST(ALL_LINGUAS) -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - IT_PO_SUBDIR([po]) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/m4/libtool.m4 new/mate-power-manager-1.8.1/m4/libtool.m4 --- old/mate-power-manager-1.8.0/m4/libtool.m4 2014-03-01 17:54:02.000000000 +0100 +++ new/mate-power-manager-1.8.1/m4/libtool.m4 2014-09-29 21:44:20.000000000 +0200 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1324,19 +1324,9 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac - ;; - powerpc64le-*) - LD="${LD-ld} -m elf32lppclinux" + LD="${LD-ld} -m elf_i386" ;; - powerpc64-*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1355,10 +1345,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1701,8 +1688,7 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2493,7 +2479,14 @@ *) objformat=elf ;; esac fi - version_type=freebsd-$objformat + # Handle Gentoo/FreeBSD as it was Linux + case $host_vendor in + gentoo) + version_type=linux ;; + *) + version_type=freebsd-$objformat ;; + esac + case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -2504,6 +2497,12 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; + linux) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_lib_prefix=no + need_version=no + ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -2526,6 +2525,17 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2642,7 +2652,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2687,18 +2697,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3258,6 +3256,10 @@ fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3296,11 +3298,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4048,7 +4050,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4112,7 +4114,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4347,7 +4349,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4589,9 +4591,6 @@ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4654,9 +4653,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4878,7 +4874,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5055,7 +5051,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5360,7 +5355,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6240,6 +6235,9 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; + gnu*) + ;; + haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6401,7 +6399,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/po/Makefile.in.in new/mate-power-manager-1.8.1/po/Makefile.in.in --- old/mate-power-manager-1.8.0/po/Makefile.in.in 2014-03-01 17:53:58.000000000 +0100 +++ new/mate-power-manager-1.8.1/po/Makefile.in.in 2014-09-29 21:44:16.000000000 +0200 @@ -33,8 +33,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = @localedir@ subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -108,7 +107,7 @@ install-data-yes: all linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ if test -r $$lang.gmo; then \ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ @@ -142,8 +141,8 @@ uninstall: linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/policy/org.mate.power.policy.in2 new/mate-power-manager-1.8.1/policy/org.mate.power.policy.in2 --- old/mate-power-manager-1.8.0/policy/org.mate.power.policy.in2 2013-03-15 21:03:43.000000000 +0100 +++ new/mate-power-manager-1.8.1/policy/org.mate.power.policy.in2 2014-04-30 20:01:25.000000000 +0200 @@ -10,7 +10,7 @@ --> <vendor>MATE Power Manager</vendor> - <vendor_url>http://www.mate.org/projects/mate-power-manager/</vendor_url> + <vendor_url>http://www.mate-desktop.org</vendor_url> <icon_name>battery</icon_name> <action id="org.mate.power.backlight-helper"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/src/gpm-backlight.c new/mate-power-manager-1.8.1/src/gpm-backlight.c --- old/mate-power-manager-1.8.0/src/gpm-backlight.c 2014-01-20 19:40:30.000000000 +0100 +++ new/mate-power-manager-1.8.1/src/gpm-backlight.c 2014-04-30 20:01:53.000000000 +0200 @@ -410,7 +410,11 @@ * Does the actions when the ac power source is inserted/removed. **/ static void +#if UP_CHECK_VERSION(0, 99, 0) +gpm_backlight_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmBacklight *backlight) +#else gpm_backlight_client_changed_cb (UpClient *client, GpmBacklight *backlight) +#endif { gpm_backlight_brightness_evaluate_and_set (backlight, FALSE, TRUE); } @@ -727,8 +731,13 @@ /* we use up_client for the ac-adapter-changed signal */ backlight->priv->client = up_client_new (); +#if UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (backlight->priv->client, "notify", + G_CALLBACK (gpm_backlight_client_changed_cb), backlight); +#else g_signal_connect (backlight->priv->client, "changed", G_CALLBACK (gpm_backlight_client_changed_cb), backlight); +#endif /* gets caps */ backlight->priv->can_dim = gpm_brightness_has_hw (backlight->priv->brightness); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/src/gpm-button.c new/mate-power-manager-1.8.1/src/gpm-button.c --- old/mate-power-manager-1.8.0/src/gpm-button.c 2013-08-02 01:00:42.000000000 +0200 +++ new/mate-power-manager-1.8.1/src/gpm-button.c 2014-04-30 20:01:53.000000000 +0200 @@ -324,7 +324,11 @@ * gpm_button_client_changed_cb **/ static void +#if UP_CHECK_VERSION(0, 99, 0) +gpm_button_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmButton *button) +#else gpm_button_client_changed_cb (UpClient *client, GpmButton *button) +#endif { gboolean lid_is_closed; @@ -363,9 +367,13 @@ button->priv->client = up_client_new (); button->priv->lid_is_closed = up_client_get_lid_is_closed (button->priv->client); +#if UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (button->priv->client, "notify", + G_CALLBACK (gpm_button_client_changed_cb), button); +#else g_signal_connect (button->priv->client, "changed", G_CALLBACK (gpm_button_client_changed_cb), button); - +#endif /* register the brightness keys */ gpm_button_xevent_key (button, XF86XK_PowerOff, GPM_BUTTON_POWER); #ifdef HAVE_XF86XK_SUSPEND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/src/gpm-common.h new/mate-power-manager-1.8.1/src/gpm-common.h --- old/mate-power-manager-1.8.0/src/gpm-common.h 2013-08-02 01:00:42.000000000 +0200 +++ new/mate-power-manager-1.8.1/src/gpm-common.h 2014-09-28 21:29:21.000000000 +0200 @@ -97,7 +97,6 @@ #define GPM_SETTINGS_SPINDOWN_TIMEOUT_BATT "spindown-timeout-battery" /* notify */ -#define GPM_SETTINGS_NOTIFY_PERHAPS_RECALL "notify-perhaps-recall" #define GPM_SETTINGS_NOTIFY_LOW_CAPACITY "notify-low-capacity" #define GPM_SETTINGS_NOTIFY_DISCHARGING "notify-discharging" #define GPM_SETTINGS_NOTIFY_FULLY_CHARGED "notify-fully-charged" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/src/gpm-control.c new/mate-power-manager-1.8.1/src/gpm-control.c --- old/mate-power-manager-1.8.0/src/gpm-control.c 2014-03-01 12:40:24.000000000 +0100 +++ new/mate-power-manager-1.8.1/src/gpm-control.c 2014-04-30 20:01:53.000000000 +0200 @@ -289,10 +289,11 @@ } g_object_unref(proxy); } +#if !UP_CHECK_VERSION(0, 99, 0) else { ret = up_client_suspend_sync (control->priv->client, NULL, error); } - +#endif egg_debug ("emitting resume"); g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_SUSPEND); @@ -399,10 +400,11 @@ ret = TRUE; } } +#if !UP_CHECK_VERSION(0, 99, 0) else { ret = up_client_hibernate_sync (control->priv->client, NULL, error); } - +#endif egg_debug ("emitting resume"); g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_HIBERNATE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/src/gpm-engine.c new/mate-power-manager-1.8.1/src/gpm-engine.c --- old/mate-power-manager-1.8.0/src/gpm-engine.c 2013-03-15 21:03:43.000000000 +0100 +++ new/mate-power-manager-1.8.1/src/gpm-engine.c 2014-04-30 20:01:53.000000000 +0200 @@ -72,7 +72,6 @@ CHARGE_ACTION, DISCHARGING, LOW_CAPACITY, - PERHAPS_RECALL, LAST_SIGNAL }; @@ -83,6 +82,31 @@ static UpDevice *gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device); static UpDevice *gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device); +#if UP_CHECK_VERSION (0, 99, 0) +static void gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine); + +#define GPM_ENGINE_WARNING_NONE UP_DEVICE_LEVEL_NONE +#define GPM_ENGINE_WARNING_DISCHARGING UP_DEVICE_LEVEL_DISCHARGING +#define GPM_ENGINE_WARNING_LOW UP_DEVICE_LEVEL_LOW +#define GPM_ENGINE_WARNING_CRITICAL UP_DEVICE_LEVEL_CRITICAL +#define GPM_ENGINE_WARNING_ACTION UP_DEVICE_LEVEL_ACTION + +/** + * gpm_engine_get_warning: + * + * This gets the possible engine state for the device according to the + * policy, which could be per-percent, or per-time. + * + * Return value: A GpmEngine state, e.g. GPM_ENGINE_WARNING_DISCHARGING + **/ +static UpDeviceLevel +gpm_engine_get_warning (GpmEngine *engine, UpDevice *device) +{ + UpDeviceLevel warning; + g_object_get (device, "warning-level", &warning, NULL); + return warning; +} +#else typedef enum { GPM_ENGINE_WARNING_NONE = 0, @@ -224,6 +248,7 @@ out: return warning_type; } +#endif /** * gpm_engine_get_summary: @@ -280,12 +305,20 @@ * Returns the icon **/ static gchar * +#if UP_CHECK_VERSION (0, 99, 0) +gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind, UpDeviceLevel warning, gboolean use_state) +#else gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind, GpmEngineWarning warning, gboolean use_state) +#endif { guint i; GPtrArray *array; UpDevice *device; +#if UP_CHECK_VERSION (0, 99, 0) + UpDeviceLevel warning_temp; +#else GpmEngineWarning warning_temp; +#endif UpDeviceKind kind; UpDeviceState state; gboolean is_present; @@ -570,6 +603,9 @@ static UpDevice * gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device) { +#if UP_CHECK_VERSION (0, 99, 0) + return engine->priv->battery_composite; +#else guint battery_devices = 0; GPtrArray *array; UpDevice *device; @@ -599,6 +635,7 @@ out: /* return composite device or original device */ return device; +#endif } /** @@ -607,6 +644,18 @@ static UpDevice * gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device) { +#if UP_CHECK_VERSION (0, 99, 0) + gchar *text; + + text = up_device_to_text (engine->priv->battery_composite); + egg_debug ("composite:\n%s", text); + g_free (text); + + /* force update of icon */ + gpm_engine_recalculate_state_icon (engine); + + return engine->priv->battery_composite; +#else guint i; gdouble percentage = 0.0; gdouble energy = 0.0; @@ -718,6 +767,7 @@ out: /* return composite device or original device */ return device; +#endif } /** @@ -726,7 +776,11 @@ static void gpm_engine_device_add (GpmEngine *engine, UpDevice *device) { +#if UP_CHECK_VERSION (0, 99, 0) + UpDeviceLevel warning; +#else GpmEngineWarning warning; +#endif UpDeviceState state; UpDeviceKind kind; UpDevice *composite; @@ -758,42 +812,13 @@ g_object_get (composite, "state", &state, NULL); g_object_set_data (G_OBJECT(composite), "engine-state-old", GUINT_TO_POINTER(state)); } -} -/** - * gpm_engine_check_recall: - **/ -static gboolean -gpm_engine_check_recall (GpmEngine *engine, UpDevice *device) -{ - UpDeviceKind kind; - gboolean recall_notice = FALSE; - gchar *recall_vendor = NULL; - gchar *recall_url = NULL; - - /* get device properties */ - g_object_get (device, - "kind", &kind, - "recall-notice", &recall_notice, - "recall-vendor", &recall_vendor, - "recall-url", &recall_url, - NULL); - - /* not battery */ - if (kind != UP_DEVICE_KIND_BATTERY) - goto out; - - /* no recall data */ - if (!recall_notice) - goto out; +#if UP_CHECK_VERSION (0, 99, 0) + g_signal_connect (device, "notify", G_CALLBACK (gpm_engine_device_changed_cb), engine); + g_ptr_array_add (engine->priv->array, g_object_ref (device)); + gpm_engine_recalculate_state (engine); +#endif - /* emit signal for manager */ - egg_debug ("** EMIT: perhaps-recall"); - g_signal_emit (engine, signals [PERHAPS_RECALL], 0, device, recall_vendor, recall_url); -out: - g_free (recall_vendor); - g_free (recall_url); - return recall_notice; } /** @@ -805,12 +830,14 @@ guint i; GPtrArray *array = NULL; UpDevice *device; +#if !UP_CHECK_VERSION(0, 99, 0) gboolean ret; GError *error = NULL; +#endif g_return_val_if_fail (engine != NULL, FALSE); g_return_val_if_fail (GPM_IS_ENGINE (engine), FALSE); - +#if !UP_CHECK_VERSION(0, 99, 0) /* get devices from UPower */ ret = up_client_enumerate_devices_sync (engine->priv->client, NULL, &error); if (!ret) { @@ -818,7 +845,7 @@ g_error_free (error); goto out; } - +#endif /* connected mobile phones */ gpm_phone_coldplug (engine->priv->phone); @@ -829,9 +856,10 @@ for (i=0;i<array->len;i++) { device = g_ptr_array_index (array, i); gpm_engine_device_add (engine, device); - gpm_engine_check_recall (engine, device); } +#if !UP_CHECK_VERSION(0, 99, 0) out: +#endif if (array != NULL) g_ptr_array_unref (array); /* never repeat */ @@ -844,17 +872,36 @@ static void gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engine) { +#if UP_CHECK_VERSION (0, 99, 0) + gpm_engine_device_add (engine, device); +#else /* add to list */ g_ptr_array_add (engine->priv->array, g_object_ref (device)); - gpm_engine_check_recall (engine, device); gpm_engine_recalculate_state (engine); +#endif } /** * gpm_engine_device_removed_cb: **/ static void +#if UP_CHECK_VERSION(0, 99, 0) +gpm_engine_device_removed_cb (UpClient *client, const char *object_path, GpmEngine *engine) +{ + guint i; + + for (i = 0; i < engine->priv->array->len; i++) { + UpDevice *device = g_ptr_array_index (engine->priv->array, i); + + if (g_strcmp0 (object_path, up_device_get_object_path (device)) == 0) { + g_ptr_array_remove_index (engine->priv->array, i); + break; + } + } + gpm_engine_recalculate_state (engine); +} +#else gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) { gboolean ret; @@ -863,19 +910,28 @@ return; gpm_engine_recalculate_state (engine); } - +#endif /** * gpm_engine_device_changed_cb: **/ static void +#if UP_CHECK_VERSION(0, 99, 0) +gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine) +#else gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) +#endif { UpDeviceKind kind; UpDeviceState state; UpDeviceState state_old; +#if UP_CHECK_VERSION(0, 99, 0) + UpDeviceLevel warning_old; + UpDeviceLevel warning; +#else GpmEngineWarning warning_old; GpmEngineWarning warning; +#endif /* get device properties */ g_object_get (device, @@ -1042,7 +1098,10 @@ static void gpm_engine_init (GpmEngine *engine) { - +#if UP_CHECK_VERSION(0, 99, 0) + GPtrArray *array = NULL; + guint i; +#endif engine->priv = GPM_ENGINE_GET_PRIVATE (engine); engine->priv->array = g_ptr_array_new_with_free_func (g_object_unref); @@ -1051,8 +1110,10 @@ G_CALLBACK (gpm_engine_device_added_cb), engine); g_signal_connect (engine->priv->client, "device-removed", G_CALLBACK (gpm_engine_device_removed_cb), engine); +#if !UP_CHECK_VERSION(0, 99, 0) g_signal_connect (engine->priv->client, "device-changed", G_CALLBACK (gpm_engine_device_changed_cb), engine); +#endif engine->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); g_signal_connect (engine->priv->settings, "changed", @@ -1067,6 +1128,11 @@ G_CALLBACK (phone_device_refresh_cb), engine); /* create a fake virtual composite battery */ +#if UP_CHECK_VERSION(0, 99, 0) + engine->priv->battery_composite = up_client_get_display_device (engine->priv->client); + g_signal_connect (engine->priv->battery_composite, "notify", + G_CALLBACK (gpm_engine_device_changed_cb), engine); +#else engine->priv->battery_composite = up_device_new (); g_object_set (engine->priv->battery_composite, "kind", UP_DEVICE_KIND_BATTERY, @@ -1075,6 +1141,7 @@ "power-supply", TRUE, "is-present", TRUE, NULL); +#endif engine->priv->previous_icon = NULL; engine->priv->previous_summary = NULL; @@ -1134,14 +1201,6 @@ G_STRUCT_OFFSET (GpmEngineClass, low_capacity), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - signals [PERHAPS_RECALL] = - g_signal_new ("perhaps-recall", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GpmEngineClass, perhaps_recall), - NULL, NULL, gpm_marshal_VOID__POINTER_STRING_STRING, - G_TYPE_NONE, - 3, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING); signals [FULLY_CHARGED] = g_signal_new ("fully-charged", G_TYPE_FROM_CLASS (object_class), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/src/gpm-engine.h new/mate-power-manager-1.8.1/src/gpm-engine.h --- old/mate-power-manager-1.8.0/src/gpm-engine.h 2013-03-15 21:03:43.000000000 +0100 +++ new/mate-power-manager-1.8.1/src/gpm-engine.h 2014-04-30 20:01:53.000000000 +0200 @@ -49,10 +49,6 @@ gchar *icon); void (* summary_changed) (GpmEngine *engine, gchar *status); - void (* perhaps_recall) (GpmEngine *engine, - UpDevice *device, - const gchar *oem_vendor, - const gchar *website); void (* low_capacity) (GpmEngine *engine, UpDevice *device); void (* charge_low) (GpmEngine *engine, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/src/gpm-kbd-backlight.c new/mate-power-manager-1.8.1/src/gpm-kbd-backlight.c --- old/mate-power-manager-1.8.0/src/gpm-kbd-backlight.c 2014-01-20 19:40:30.000000000 +0100 +++ new/mate-power-manager-1.8.1/src/gpm-kbd-backlight.c 2014-09-28 21:29:21.000000000 +0200 @@ -128,6 +128,9 @@ guint goal; g_return_val_if_fail (GPM_IS_KBD_BACKLIGHT (backlight), FALSE); + /* avoid warnings if no keyboard brightness is available */ + if (backlight->priv->max_brightness < 1) + return FALSE; /* if we're setting the same we are, don't bother */ //g_return_val_if_fail (backlight->priv->brightness_percent != percentage, FALSE); @@ -532,6 +535,9 @@ **/ static void gpm_kbd_backlight_client_changed_cb (UpClient *client, +#if UP_CHECK_VERSION(0, 99, 0) + GParamSpec *pspec, +#endif GpmKbdBacklight *backlight) { gpm_kbd_backlight_evaluate_power_source_and_set (backlight); @@ -801,8 +807,13 @@ /* Use upower for ac changed signal */ backlight->priv->client = up_client_new (); +#if UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (backlight->priv->client, "notify", + G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight); +#else g_signal_connect (backlight->priv->client, "changed", G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight); +#endif backlight->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); //g_signal_connect (backlight->priv->settings, "changed", G_CALLBACK (gpm_settings_key_changed_cb), backlight); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/src/gpm-manager.c new/mate-power-manager-1.8.1/src/gpm-manager.c --- old/mate-power-manager-1.8.0/src/gpm-manager.c 2013-12-16 23:01:29.000000000 +0100 +++ new/mate-power-manager-1.8.1/src/gpm-manager.c 2014-09-28 21:29:21.000000000 +0200 @@ -67,7 +67,6 @@ static void gpm_manager_finalize (GObject *object); #define GPM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_MANAGER, GpmManagerPrivate)) -#define GPM_MANAGER_RECALL_DELAY 30 /* seconds */ #define GPM_MANAGER_NOTIFY_TIMEOUT_NEVER 0 /* ms */ #define GPM_MANAGER_NOTIFY_TIMEOUT_SHORT 10 * 1000 /* ms */ #define GPM_MANAGER_NOTIFY_TIMEOUT_LONG 30 * 1000 /* ms */ @@ -971,7 +970,11 @@ * gpm_manager_client_changed_cb: **/ static void +#if UP_CHECK_VERSION(0, 99, 0) +gpm_manager_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmManager *manager) +#else gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager) +#endif { gboolean event_when_closed; gint timeout; @@ -1091,111 +1094,6 @@ } /** - * gpm_manager_perhaps_recall_response_cb: - */ -static void -gpm_manager_perhaps_recall_response_cb (GtkDialog *dialog, gint response_id, GpmManager *manager) -{ - GdkScreen *screen; - GtkWidget *dialog_error; - GError *error = NULL; - gboolean ret; - const gchar *website; - - /* don't show this again */ - if (response_id == GTK_RESPONSE_CANCEL) { - g_settings_set_boolean (manager->priv->settings, GPM_SETTINGS_NOTIFY_PERHAPS_RECALL, FALSE); - goto out; - } - - /* visit recall website */ - if (response_id == GTK_RESPONSE_OK) { - screen = gdk_screen_get_default(); - website = (const gchar *) g_object_get_data (G_OBJECT (manager), "recall-oem-website"); - ret = gtk_show_uri (screen, website, gtk_get_current_event_time (), &error); - if (!ret) { - dialog_error = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, - "Failed to show url %s", error->message); - gtk_dialog_run (GTK_DIALOG (dialog_error)); - g_error_free (error); - } - goto out; - } -out: - gtk_widget_destroy (GTK_WIDGET (dialog)); - return; -} - -/** - * gpm_manager_perhaps_recall_delay_cb: - */ -static gboolean -gpm_manager_perhaps_recall_delay_cb (GpmManager *manager) -{ - const gchar *oem_vendor; - gchar *title = NULL; - gchar *message = NULL; - GtkWidget *dialog; - - oem_vendor = (const gchar *) g_object_get_data (G_OBJECT (manager), "recall-oem-vendor"); - - /* TRANSLATORS: the battery may be recalled by it's vendor */ - title = g_strdup_printf ("%s: %s", GPM_NAME, _("Battery may be recalled")); - message = g_strdup_printf (_("A battery in your computer may have been " - "recalled by %s and you may be at risk.\n\n" - "For more information visit the battery recall website."), oem_vendor); - dialog = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, - "%s", title); - - gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", message); - - /* TRANSLATORS: button text, visit the manufacturers recall website */ - gtk_dialog_add_button (GTK_DIALOG (dialog), _("Visit recall website"), GTK_RESPONSE_OK); - - /* TRANSLATORS: button text, do not show this bubble again */ - gtk_dialog_add_button (GTK_DIALOG (dialog), _("Do not show me this again"), GTK_RESPONSE_CANCEL); - - /* wait async for response */ - gtk_widget_show (dialog); - g_signal_connect (dialog, "response", G_CALLBACK (gpm_manager_perhaps_recall_response_cb), manager); - - g_free (title); - g_free (message); - - /* never repeat */ - return FALSE; -} - -/** - * gpm_manager_engine_perhaps_recall_cb: - */ -static void -gpm_manager_engine_perhaps_recall_cb (GpmEngine *engine, UpDevice *device, gchar *oem_vendor, gchar *website, GpmManager *manager) -{ - gboolean ret; - - /* don't show when running under GDM */ - if (g_getenv ("RUNNING_UNDER_GDM") != NULL) { - egg_debug ("running under gdm, so no notification"); - return; - } - - /* already shown, and dismissed */ - ret = g_settings_get_boolean (manager->priv->settings, GPM_SETTINGS_NOTIFY_PERHAPS_RECALL); - if (!ret) { - egg_debug ("Gsettings prevents notification: %s", GPM_SETTINGS_NOTIFY_PERHAPS_RECALL); - return; - } - - g_object_set_data_full (G_OBJECT (manager), "recall-oem-vendor", (gpointer) g_strdup (oem_vendor), (GDestroyNotify) g_free); - g_object_set_data_full (G_OBJECT (manager), "recall-oem-website", (gpointer) g_strdup (website), (GDestroyNotify) g_free); - - /* delay by a few seconds so the panel can load */ - g_timeout_add_seconds (GPM_MANAGER_RECALL_DELAY, (GSourceFunc) gpm_manager_perhaps_recall_delay_cb, manager); -} - -/** * gpm_manager_engine_icon_changed_cb: */ static void @@ -1958,8 +1856,15 @@ g_signal_connect (manager->priv->settings, "changed", G_CALLBACK (gpm_manager_settings_changed_cb), manager); manager->priv->client = up_client_new (); +#if UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (manager->priv->client, "notify::lid-is-closed", + G_CALLBACK (gpm_manager_client_changed_cb), manager); + g_signal_connect (manager->priv->client, "notify::on-battery", + G_CALLBACK (gpm_manager_client_changed_cb), manager); +#else g_signal_connect (manager->priv->client, "changed", G_CALLBACK (gpm_manager_client_changed_cb), manager); +#endif /* use libmatenotify */ notify_init (GPM_NAME); @@ -2020,8 +1925,6 @@ gpm_manager_sync_policy_sleep (manager); manager->priv->engine = gpm_engine_new (); - g_signal_connect (manager->priv->engine, "perhaps-recall", - G_CALLBACK (gpm_manager_engine_perhaps_recall_cb), manager); g_signal_connect (manager->priv->engine, "low-capacity", G_CALLBACK (gpm_manager_engine_low_capacity_cb), manager); g_signal_connect (manager->priv->engine, "icon-changed", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/src/gpm-prefs-core.c new/mate-power-manager-1.8.1/src/gpm-prefs-core.c --- old/mate-power-manager-1.8.0/src/gpm-prefs-core.c 2014-03-01 12:40:24.000000000 +0100 +++ new/mate-power-manager-1.8.1/src/gpm-prefs-core.c 2014-09-28 21:29:21.000000000 +0200 @@ -811,7 +811,9 @@ UpDevice *device; UpDeviceKind kind; GpmBrightness *brightness; +#if !UP_CHECK_VERSION(0, 99, 0) gboolean ret; +#endif guint i; GDBusProxy *proxy; @@ -897,9 +899,11 @@ else { /* are we allowed to shutdown? */ egg_console_kit_can_stop (prefs->priv->console, &prefs->priv->can_shutdown, NULL); +#if !UP_CHECK_VERSION(0, 99, 0) /* get values from UpClient */ prefs->priv->can_suspend = up_client_get_can_suspend (prefs->priv->client); prefs->priv->can_hibernate = up_client_get_can_hibernate (prefs->priv->client); +#endif } if (LOGIND_RUNNING()) { @@ -953,14 +957,14 @@ brightness = gpm_brightness_new (); prefs->priv->has_lcd = gpm_brightness_has_hw (brightness); g_object_unref (brightness); - +#if !UP_CHECK_VERSION(0, 99, 0) /* get device list */ ret = up_client_enumerate_devices_sync (prefs->priv->client, NULL, &error); if (!ret) { egg_warning ("failed to get device list: %s", error->message); g_error_free (error); } - +#endif devices = up_client_get_devices (prefs->priv->client); for (i=0; i<devices->len; i++) { device = g_ptr_array_index (devices, i); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/src/gpm-statistics.c new/mate-power-manager-1.8.1/src/gpm-statistics.c --- old/mate-power-manager-1.8.0/src/gpm-statistics.c 2013-08-02 01:00:42.000000000 +0200 +++ new/mate-power-manager-1.8.1/src/gpm-statistics.c 2014-09-28 21:29:21.000000000 +0200 @@ -1236,6 +1236,12 @@ * gpm_stats_device_changed_cb: **/ static void +#if UP_CHECK_VERSION(0, 99, 0) +gpm_stats_device_changed_cb (UpClient *client, GParamSpec *pspec, gpointer user_data) +{ + gpm_stats_button_update_ui(); +} +#else gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer user_data) { const gchar *object_path; @@ -1246,6 +1252,7 @@ if (g_strcmp0 (current_device, object_path) == 0) gpm_stats_update_info_data (device); } +#endif /** * gpm_stats_device_removed_cb: @@ -1794,11 +1801,12 @@ wakeups = up_wakeups_new (); g_signal_connect (wakeups, "data-changed", G_CALLBACK (gpm_stats_data_changed_cb), NULL); - +#if !UP_CHECK_VERSION(0, 99, 0) /* coldplug */ ret = up_client_enumerate_devices_sync (client, NULL, NULL); if (!ret) goto out; +#endif devices = up_client_get_devices (client); /* add devices in visually pleasing order */ @@ -1814,7 +1822,11 @@ /* connect now the coldplug is done */ g_signal_connect (client, "device-added", G_CALLBACK (gpm_stats_device_added_cb), NULL); g_signal_connect (client, "device-removed", G_CALLBACK (gpm_stats_device_removed_cb), NULL); +#if UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (client, "notify", G_CALLBACK (gpm_stats_device_changed_cb), NULL); +#else g_signal_connect (client, "device-changed", G_CALLBACK (gpm_stats_device_changed_cb), NULL); +#endif /* set current device */ if (devices->len > 0) { @@ -1854,8 +1866,9 @@ gtk_widget_show (widget); gtk_main (); - +#if !UP_CHECK_VERSION(0, 99, 0) out: +#endif g_object_unref (settings); g_object_unref (client); g_object_unref (wakeups); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/tools/Makefile.am new/mate-power-manager-1.8.1/tools/Makefile.am --- old/mate-power-manager-1.8.0/tools/Makefile.am 2013-03-15 21:03:43.000000000 +0100 +++ new/mate-power-manager-1.8.1/tools/Makefile.am 2014-04-30 20:01:53.000000000 +0200 @@ -1,5 +1,5 @@ script_SCRIPTS = \ - mate-power-bugreport.sh + mate-power-manager-bugreport EXTRA_DIST=$(script_SCRIPTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/tools/mate-power-bugreport.sh new/mate-power-manager-1.8.1/tools/mate-power-bugreport.sh --- old/mate-power-manager-1.8.0/tools/mate-power-bugreport.sh 2013-03-15 21:03:43.000000000 +0100 +++ new/mate-power-manager-1.8.1/tools/mate-power-bugreport.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -#! /bin/sh -# Copyright (C) 2006-2007 Richard Hughes <richard(a)hughsie.com> -# -# Licensed under the GNU General Public License Version 2 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -#$1 = keyname -print_hal_key () -{ - udi="/org/freedesktop/Hal/devices/computer" - ret=`hal-get-property --udi $udi --key $1 2> /dev/null` - if [ $? -eq 0 ]; then - echo $ret - else - echo "missing" - fi -} - -#$1 = capability -print_hal_capability () -{ - ret=`hal-find-by-capability --capability $1` - if [ -n "$ret" ]; then - echo "yes" - else - echo "no" - fi -} - -echo -n "Distro version: " -cat /etc/*release | uniq - -echo -n "Kernel version: " -uname -r - -echo -n "g-p-m version: " -mate-power-manager --version | cut -f2 -d" " - -echo -n "HAL version: " -lshal -V | cut -f3 -d" " - -echo -n "System manufacturer: " -print_hal_key "smbios.system.manufacturer" -echo -n "System version: " -print_hal_key "smbios.system.version" -echo -n "System product: " -print_hal_key "smbios.system.product" - -echo -n "AC adapter present: " -print_hal_capability "ac_adapter" - -echo -n "Battery present: " -print_hal_capability "battery" - -echo -n "Laptop panel present: " -print_hal_capability "laptop_panel" - -echo -n "CPU scaling present: " -print_hal_capability "cpufreq_control" - -echo "Battery Information:" -lshal | grep "battery\." - -OS=`uname -s` - -echo "UPower data:" -upower --dump - -echo "MATE Power Manager Process Information:" -if [ "$OS" = "SunOS" ]; then - ptree -a `pgrep power` -else - ps aux --forest | grep mate-power | grep -v grep -fi - -echo "HAL Process Information:" -if [ "$OS" = "SunOS" ]; then - ptree -a `pgrep hald` -else - ps aux --forest | grep hald | grep -v grep -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-power-manager-1.8.0/tools/mate-power-manager-bugreport new/mate-power-manager-1.8.1/tools/mate-power-manager-bugreport --- old/mate-power-manager-1.8.0/tools/mate-power-manager-bugreport 1970-01-01 01:00:00.000000000 +0100 +++ new/mate-power-manager-1.8.1/tools/mate-power-manager-bugreport 2014-04-30 20:01:53.000000000 +0200 @@ -0,0 +1,90 @@ +#! /bin/sh +# Copyright (C) 2006-2007 Richard Hughes <richard(a)hughsie.com> +# +# Licensed under the GNU General Public License Version 2 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +#$1 = keyname +print_hal_key () +{ + udi="/org/freedesktop/Hal/devices/computer" + ret=`hal-get-property --udi $udi --key $1 2> /dev/null` + if [ $? -eq 0 ]; then + echo $ret + else + echo "missing" + fi +} + +#$1 = capability +print_hal_capability () +{ + ret=`hal-find-by-capability --capability $1` + if [ -n "$ret" ]; then + echo "yes" + else + echo "no" + fi +} + +echo -n "Distro version: " +cat /etc/*release | uniq + +echo -n "Kernel version: " +uname -r + +echo -n "g-p-m version: " +mate-power-manager --version | cut -f2 -d" " + +echo -n "HAL version: " +lshal -V | cut -f3 -d" " + +echo -n "System manufacturer: " +print_hal_key "smbios.system.manufacturer" +echo -n "System version: " +print_hal_key "smbios.system.version" +echo -n "System product: " +print_hal_key "smbios.system.product" + +echo -n "AC adapter present: " +print_hal_capability "ac_adapter" + +echo -n "Battery present: " +print_hal_capability "battery" + +echo -n "Laptop panel present: " +print_hal_capability "laptop_panel" + +echo -n "CPU scaling present: " +print_hal_capability "cpufreq_control" + +echo "Battery Information:" +lshal | grep "battery\." + +OS=`uname -s` + +echo "UPower data:" +upower --dump + +echo "MATE Power Manager Process Information:" +if [ "$OS" = "SunOS" ]; then + ptree -a `pgrep power` +else + ps aux --forest | grep mate-power | grep -v grep +fi + +echo "HAL Process Information:" +if [ "$OS" = "SunOS" ]; then + ptree -a `pgrep hald` +else + ps aux --forest | grep hald | grep -v grep +fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python3-Markdown for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package python3-Markdown for openSUSE:Factory checked in at 2014-10-05 20:31:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-Markdown (Old) and /work/SRC/openSUSE:Factory/.python3-Markdown.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-Markdown" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-Markdown/python3-Markdown.changes 2014-09-19 15:45:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-Markdown.new/python3-Markdown.changes 2014-10-05 20:33:29.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Oct 3 14:27:57 UTC 2014 - benoit.monin(a)gmx.fr + +- update to version 2.5.1: bugfix release + +------------------------------------------------------------------- Old: ---- Markdown-2.5.tar.gz New: ---- Markdown-2.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-Markdown.spec ++++++ --- /var/tmp/diff_new_pack.A8G4zq/_old 2014-10-05 20:33:30.000000000 +0200 +++ /var/tmp/diff_new_pack.A8G4zq/_new 2014-10-05 20:33:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-Markdown -Version: 2.5 +Version: 2.5.1 Release: 0 Summary: Python implementation of Markdown License: BSD-3-Clause ++++++ Markdown-2.5.tar.gz -> Markdown-2.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/MANIFEST new/Markdown-2.5.1/MANIFEST --- old/Markdown-2.5/MANIFEST 2014-09-13 02:40:56.000000000 +0200 +++ new/Markdown-2.5.1/MANIFEST 2014-09-27 00:40:18.000000000 +0200 @@ -238,6 +238,8 @@ tests/misc/em-around-links.txt tests/misc/em_strong.html tests/misc/em_strong.txt +tests/misc/em_strong_complex.html +tests/misc/em_strong_complex.txt tests/misc/email.html tests/misc/email.txt tests/misc/escaped_chars_in_js.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/PKG-INFO new/Markdown-2.5.1/PKG-INFO --- old/Markdown-2.5/PKG-INFO 2014-09-13 02:40:59.000000000 +0200 +++ new/Markdown-2.5.1/PKG-INFO 2014-09-27 00:40:21.000000000 +0200 @@ -1,12 +1,12 @@ Metadata-Version: 1.0 Name: Markdown -Version: 2.5 +Version: 2.5.1 Summary: Python implementation of Markdown. Home-page: https://pythonhosted.org/Markdown/ Author: Waylan Limberg Author-email: waylan [at] gmail.com License: BSD License -Download-URL: http://pypi.python.org/packages/source/M/Markdown/Markdown-2.5.tar.gz +Download-URL: http://pypi.python.org/packages/source/M/Markdown/Markdown-2.5.1.tar.gz Description: This is a Python implementation of John Gruber's Markdown_. It is almost completely compliant with the reference implementation, though there are a few known issues. See Features_ for information diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/docs/change_log.txt new/Markdown-2.5.1/docs/change_log.txt --- old/Markdown-2.5/docs/change_log.txt 2014-08-26 03:30:47.000000000 +0200 +++ new/Markdown-2.5.1/docs/change_log.txt 2014-09-27 00:33:46.000000000 +0200 @@ -7,9 +7,11 @@ Python-Markdown Changelog ========================= -[TBD]: Released version 2.5.0 ([Notes](release-2.5.html)) +Sept 26, 2014: Released version 2.5.1 (a bugfix release). -Feb 16, 2014: Released version 2.4.0 ([Notes](release-2.4.html)) +Sept 12, 2014: Released version 2.5.0 ([Notes](release-2.5.html)). + +Feb 16, 2014: Released version 2.4.0 ([Notes](release-2.4.html)). Mar 22, 2013: Released version 2.3.1 (a bugfix release). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/docs/release-2.5.txt new/Markdown-2.5.1/docs/release-2.5.txt --- old/Markdown-2.5/docs/release-2.5.txt 2014-09-13 02:32:11.000000000 +0200 +++ new/Markdown-2.5.1/docs/release-2.5.txt 2014-09-27 00:35:06.000000000 +0200 @@ -16,10 +16,7 @@ ------------------------------ * Python-Markdown no longer supports Python version 2.6. You must be using Python - versions 2.7, 3.2, 3.3, or 3.4. While Python-Markdown is no longer tested against - Python 2.6, you may be able to get it working if you install a copy of [importlib] - which has been backported for Python 2.6. However, the developers of Python-Markdown - offer no guarentees in that situation. + versions 2.7, 3.2, 3.3, or 3.4. [importlib]: https://pypi.python.org/pypi/importlib @@ -177,7 +174,7 @@ [JSON]: http://json.org/ [PyYAML]: http://pyyaml.org/ -* The [amonition extension][ae] is no longer considered "experimental." +* The [admonition extension][ae] is no longer considered "experimental." [ae]: extensions/admonition.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/markdown/__init__.py new/Markdown-2.5.1/markdown/__init__.py --- old/Markdown-2.5/markdown/__init__.py 2014-09-13 02:32:11.000000000 +0200 +++ new/Markdown-2.5.1/markdown/__init__.py 2014-09-26 04:31:04.000000000 +0200 @@ -221,6 +221,10 @@ # Assume string uses dot syntax (`path.to.some.module`) module = importlib.import_module(ext_name) logger.debug('Successfuly imported extension module "%s".' % ext_name) + # For backward compat (until deprecation) check that this is an extension + if '.' not in ext_name and not (hasattr(module, 'extendMarkdown') or (class_name and hasattr(module, class_name))): + # We have a name conflict (eg: extensions=['tables'] and PyTables is installed) + raise ImportError except ImportError: # Preppend `markdown.extensions.` to name module_name = '.'.join(['markdown.extensions', ext_name]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/markdown/__version__.py new/Markdown-2.5.1/markdown/__version__.py --- old/Markdown-2.5/markdown/__version__.py 2014-09-13 02:40:10.000000000 +0200 +++ new/Markdown-2.5.1/markdown/__version__.py 2014-09-27 00:31:53.000000000 +0200 @@ -5,7 +5,7 @@ # (major, minor, micro, alpha/beta/rc/final, #) # (1, 1, 2, 'alpha', 0) => "1.1.2.dev" # (1, 2, 0, 'beta', 2) => "1.2b2" -version_info = (2, 5, 0, 'final', 0) +version_info = (2, 5, 1, 'final', 0) def _get_version(): " Returns a PEP 386-compliant version number from version_info. " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/markdown/extensions/meta.py new/Markdown-2.5.1/markdown/extensions/meta.py --- old/Markdown-2.5/markdown/extensions/meta.py 2014-08-26 03:30:47.000000000 +0200 +++ new/Markdown-2.5.1/markdown/extensions/meta.py 2014-09-27 00:30:31.000000000 +0200 @@ -31,7 +31,7 @@ def extendMarkdown(self, md, md_globals): """ Add MetaPreprocessor to Markdown instance. """ - md.preprocessors.add("meta", MetaPreprocessor(md), "_begin") + md.preprocessors.add("meta", MetaPreprocessor(md), ">normalize_whitespace") class MetaPreprocessor(Preprocessor): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/markdown/extensions/toc.py new/Markdown-2.5.1/markdown/extensions/toc.py --- old/Markdown-2.5/markdown/extensions/toc.py 2014-08-26 03:30:47.000000000 +0200 +++ new/Markdown-2.5.1/markdown/extensions/toc.py 2014-09-26 04:31:04.000000000 +0200 @@ -216,9 +216,9 @@ "slugify" : [slugify, "Function to generate anchors based on header text - " "Defaults to the headerid ext's slugify function."], - "title" : [None, + "title" : ["", "Title to insert into TOC <div> - " - "Defaults to None"], + "Defaults to an empty string"], "anchorlink" : [0, "1 if header should be a self link - " "Defaults to 0"], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/markdown/inlinepatterns.py new/Markdown-2.5.1/markdown/inlinepatterns.py --- old/Markdown-2.5/markdown/inlinepatterns.py 2014-08-26 03:30:47.000000000 +0200 +++ new/Markdown-2.5.1/markdown/inlinepatterns.py 2014-09-27 00:30:31.000000000 +0200 @@ -75,7 +75,8 @@ inlinePatterns["html"] = HtmlPattern(HTML_RE, md_instance) inlinePatterns["entity"] = HtmlPattern(ENTITY_RE, md_instance) inlinePatterns["not_strong"] = SimpleTextPattern(NOT_STRONG_RE) - inlinePatterns["strong_em"] = DoubleTagPattern(STRONG_EM_RE, 'strong,em') + inlinePatterns["em_strong"] = DoubleTagPattern(EM_STRONG_RE, 'strong,em') + inlinePatterns["strong_em"] = DoubleTagPattern(STRONG_EM_RE, 'em,strong') inlinePatterns["strong"] = SimpleTagPattern(STRONG_RE, 'strong') inlinePatterns["emphasis"] = SimpleTagPattern(EMPHASIS_RE, 'em') if md_instance.smart_emphasis: @@ -100,7 +101,8 @@ ESCAPE_RE = r'\\(.)' # \< EMPHASIS_RE = r'(\*)([^\*]+)\2' # *emphasis* STRONG_RE = r'(\*{2}|_{2})(.+?)\2' # **strong** -STRONG_EM_RE = r'(\*{3}|_{3})(.+?)\2' # ***strong*** +EM_STRONG_RE = r'(\*|_){3}(.+?)\2(.*?)\2{2}' # ***strongem*** or ***em*strong** +STRONG_EM_RE = r'(\*|_){3}(.+?)\2{2}(.*?)\2' # ***strong**em* SMART_EMPHASIS_RE = r'(?<!\w)(_)(?!_)(.+?)(?<!_)\2(?!\w)' # _smart_emphasis_ EMPHASIS_2_RE = r'(_)(.+?)\2' # _emphasis_ LINK_RE = NOIMG + BRK + \ @@ -156,7 +158,7 @@ """ self.pattern = pattern - self.compiled_re = re.compile("^(.*?)%s(.*?)$" % pattern, + self.compiled_re = re.compile("^(.*?)%s(.*?)$" % pattern, re.DOTALL | re.UNICODE) # Api for Markdown to pass safe_mode into instance @@ -210,7 +212,7 @@ return value else: # An etree Element - return text content only - return ''.join(itertext(value)) + return ''.join(itertext(value)) return util.INLINE_PLACEHOLDER_RE.sub(get_stash, text) @@ -228,7 +230,7 @@ if char in self.markdown.ESCAPED_CHARS: return '%s%s%s' % (util.STX, ord(char), util.ETX) else: - return None + return None class SimpleTagPattern(Pattern): @@ -276,6 +278,8 @@ el1 = util.etree.Element(tag1) el2 = util.etree.SubElement(el1, tag2) el2.text = m.group(3) + if len(m.groups())==5: + el2.tail = m.group(4) return el1 @@ -300,7 +304,7 @@ return self.markdown.serializer(value) except: return '\%s' % value - + return util.INLINE_PLACEHOLDER_RE.sub(get_stash, text) @@ -320,7 +324,7 @@ el.set("href", "") if title: - title = dequote(self.unescape(title)) + title = dequote(self.unescape(title)) el.set("title", title) return el @@ -344,19 +348,19 @@ if not self.markdown.safeMode: # Return immediately bipassing parsing. return url - + try: scheme, netloc, path, params, query, fragment = url = urlparse(url) except ValueError: #pragma: no cover # Bad url - so bad it couldn't be parsed. return '' - + locless_schemes = ['', 'mailto', 'news'] allowed_schemes = locless_schemes + ['http', 'https', 'ftp', 'ftps'] if scheme not in allowed_schemes: # Not a known (allowed) scheme. Not safe. return '' - + if netloc == '' and scheme not in locless_schemes: #pragma: no cover # This should not happen. Treat as suspect. return '' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/markdown/treeprocessors.py new/Markdown-2.5.1/markdown/treeprocessors.py --- old/Markdown-2.5/markdown/treeprocessors.py 2014-09-13 02:32:11.000000000 +0200 +++ new/Markdown-2.5.1/markdown/treeprocessors.py 2014-09-27 00:30:31.000000000 +0200 @@ -34,8 +34,8 @@ def run(self, root): """ Subclasses of Treeprocessor should implement a `run` method, which - takes a root ElementTree. This method can return another ElementTree - object, and the existing root ElementTree will be replaced, or it can + takes a root ElementTree. This method can return another ElementTree + object, and the existing root ElementTree will be replaced, or it can modify the current tree and return None. """ pass #pragma: no cover @@ -71,7 +71,7 @@ * index: index, from which we start search Returns: placeholder id and string index, after the found placeholder. - + """ m = self.__placeholder_re.search(data, index) if m: @@ -129,11 +129,10 @@ text = subnode.tail subnode.tail = None - childResult = self.__processPlaceholders(text, subnode) + childResult = self.__processPlaceholders(text, subnode, isText) if not isText and node is not subnode: pos = list(node).index(subnode) - node.remove(subnode) else: pos = 0 @@ -141,7 +140,7 @@ for newChild in childResult: node.insert(pos, newChild) - def __processPlaceholders(self, data, parent): + def __processPlaceholders(self, data, parent, isText=True): """ Process string with placeholders and generate ElementTree tree. @@ -151,7 +150,7 @@ * parent: Element, which contains processing inline data Returns: list with ElementTree elements with applied inline patterns. - + """ def linkText(text): if text: @@ -160,6 +159,11 @@ result[-1].tail += text else: result[-1].tail = text + elif not isText: + if parent.tail: + parent.tail += text + else: + parent.tail = text else: if parent.text: parent.text += text @@ -183,7 +187,7 @@ for child in [node] + list(node): if child.tail: if child.tail.strip(): - self.__processElementText(node, child,False) + self.__processElementText(node, child, False) if child.text: if child.text.strip(): self.__processElementText(child, child) @@ -240,7 +244,7 @@ # We need to process current node too for child in [node] + list(node): if not isString(node): - if child.text: + if child.text: child.text = self.__handleInline(child.text, patternIndex + 1) if child.tail: @@ -288,11 +292,10 @@ if child.tail: tail = self.__handleInline(child.tail) dumby = util.etree.Element('d') - tailResult = self.__processPlaceholders(tail, dumby) - if dumby.text: - child.tail = dumby.text - else: - child.tail = None + child.tail = None + tailResult = self.__processPlaceholders(tail, dumby, False) + if dumby.tail: + child.tail = dumby.tail pos = list(currElement).index(child) + 1 tailResult.reverse() for newChild in tailResult: @@ -304,7 +307,7 @@ if self.markdown.enable_attributes: if element.text and isString(element.text): element.text = \ - inlinepatterns.handleAttributes(element.text, + inlinepatterns.handleAttributes(element.text, element) i = 0 for newChild in lst: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/tests/misc/em_strong_complex.html new/Markdown-2.5.1/tests/misc/em_strong_complex.html --- old/Markdown-2.5/tests/misc/em_strong_complex.html 1970-01-01 01:00:00.000000000 +0100 +++ new/Markdown-2.5.1/tests/misc/em_strong_complex.html 2014-09-27 00:30:31.000000000 +0200 @@ -0,0 +1,14 @@ +test test test test +test test test test +test +test_ +test test_ +test test +test_test test_test +test test test test +test test test test +*test +test +test* +test test +testtest testtest \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/tests/misc/em_strong_complex.txt new/Markdown-2.5.1/tests/misc/em_strong_complex.txt --- old/Markdown-2.5/tests/misc/em_strong_complex.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/Markdown-2.5.1/tests/misc/em_strong_complex.txt 2014-09-27 00:30:31.000000000 +0200 @@ -0,0 +1,27 @@ +___test test__ test test_ + +___test test_ test test__ + +___test___ + +__test___ + +___test_ test___ + +___test_ test__ + +_test_test test_test_ + +***test test** test test* + +***test test* test test** + +**test* + +***test*** + +**test*** + +***test* test** + +*test*test test*test* \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/tests/test_apis.py new/Markdown-2.5.1/tests/test_apis.py --- old/Markdown-2.5/tests/test_apis.py 2014-09-13 02:32:11.000000000 +0200 +++ new/Markdown-2.5.1/tests/test_apis.py 2014-09-27 00:30:31.000000000 +0200 @@ -289,25 +289,22 @@ def testLoadBadExtension(self): """ Test loading of an Extension with no makeExtension function. """ - _create_fake_extension(name='fake_a', has_factory_func=False) - self.assertRaises(AttributeError, markdown.Markdown, extensions=['fake_a']) + self.assertRaises(AttributeError, markdown.Markdown, extensions=['markdown.util']) def testNonExtension(self): """ Test loading a non Extension object as an extension. """ - _create_fake_extension(name='fake_b', is_wrong_type=True) - self.assertRaises(TypeError, markdown.Markdown, extensions=['fake_b']) + self.assertRaises(TypeError, markdown.Markdown, extensions=[object]) def testBaseExtention(self): """ Test that the base Extension class will raise NotImplemented. """ - _create_fake_extension(name='fake_c') self.assertRaises(NotImplementedError, - markdown.Markdown, extensions=['fake_c']) + markdown.Markdown, extensions=[markdown.extensions.Extension()]) def testMdxExtention(self): """ Test that appending mdx_ raises a PendingDeprecationWarning. """ - _create_fake_extension(name='fake_d', use_old_style=True) + _create_fake_extension(name='fake', use_old_style=True) self.assertRaises(PendingDeprecationWarning, - markdown.Markdown, extensions=['fake_d']) + markdown.Markdown, extensions=['fake']) def testShortNameExtention(self): """ Test that using a short name raises a PendingDeprecationWarning. """ @@ -383,6 +380,20 @@ '\n') +class testElementTailTests(unittest.TestCase): + """ Element Tail Tests """ + def setUp(self): + self.pretty = markdown.treeprocessors.PrettifyTreeprocessor() + + def testBrTailNoNewline(self): + """ Test that last in tree has a new line tail """ + root = markdown.util.etree.Element('root') + br = markdown.util.etree.SubElement(root, 'br') + self.assertEqual(br.tail, None) + self.pretty.run(root) + self.assertEqual(br.tail, "\n") + + class testSerializers(unittest.TestCase): """ Test the html and xhtml serializers. """ @@ -590,7 +601,7 @@ with os.fdopen(fd, 'w') as fp: fp.write(config) - def testExtensonConfigOption(self): + def testExtensionConfigOption(self): config = { 'markdown.extensions.wikilinks': { 'base_url': 'http://example.com/', @@ -606,6 +617,19 @@ self.default_options['extension_configs'] = config self.assertEqual(options, self.default_options) + def textBoolExtensionConfigOption(self): + config = { + 'markdown.extensions.toc': { + 'title': 'Some Title', + 'anchorlink': True, + 'permalink': True + } + } + self.create_config_file(config) + options, logging_level = parse_options(['-c', self.tempfile]) + self.default_options['extension_configs'] = config + self.assertEqual(options, self.default_options) + def testExtensonConfigOptionAsJSON(self): config = { 'markdown.extensions.wikilinks': { @@ -632,4 +656,4 @@ PLACE_MARKER= ~~~footnotes~~~ """ self.create_config_file(config) - self.assertRaises(yaml.YAMLError, parse_options, ['-c', self.tempfile]) \ No newline at end of file + self.assertRaises(yaml.YAMLError, parse_options, ['-c', self.tempfile]) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-Markdown for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package python-Markdown for openSUSE:Factory checked in at 2014-10-05 20:31:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Markdown (Old) and /work/SRC/openSUSE:Factory/.python-Markdown.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Markdown" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Markdown/python-Markdown.changes 2014-09-19 15:45:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-Markdown.new/python-Markdown.changes 2014-10-05 20:33:28.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Oct 3 14:25:27 UTC 2014 - benoit.monin(a)gmx.fr + +- update to version 2.5.1: bugfix release + +------------------------------------------------------------------- Old: ---- Markdown-2.5.tar.gz New: ---- Markdown-2.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Markdown.spec ++++++ --- /var/tmp/diff_new_pack.rWM3zu/_old 2014-10-05 20:33:28.000000000 +0200 +++ /var/tmp/diff_new_pack.rWM3zu/_new 2014-10-05 20:33:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-Markdown -Version: 2.5 +Version: 2.5.1 Release: 0 Summary: Python implementation of Markdown License: BSD-3-Clause ++++++ Markdown-2.5.tar.gz -> Markdown-2.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/MANIFEST new/Markdown-2.5.1/MANIFEST --- old/Markdown-2.5/MANIFEST 2014-09-13 02:40:56.000000000 +0200 +++ new/Markdown-2.5.1/MANIFEST 2014-09-27 00:40:18.000000000 +0200 @@ -238,6 +238,8 @@ tests/misc/em-around-links.txt tests/misc/em_strong.html tests/misc/em_strong.txt +tests/misc/em_strong_complex.html +tests/misc/em_strong_complex.txt tests/misc/email.html tests/misc/email.txt tests/misc/escaped_chars_in_js.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/PKG-INFO new/Markdown-2.5.1/PKG-INFO --- old/Markdown-2.5/PKG-INFO 2014-09-13 02:40:59.000000000 +0200 +++ new/Markdown-2.5.1/PKG-INFO 2014-09-27 00:40:21.000000000 +0200 @@ -1,12 +1,12 @@ Metadata-Version: 1.0 Name: Markdown -Version: 2.5 +Version: 2.5.1 Summary: Python implementation of Markdown. Home-page: https://pythonhosted.org/Markdown/ Author: Waylan Limberg Author-email: waylan [at] gmail.com License: BSD License -Download-URL: http://pypi.python.org/packages/source/M/Markdown/Markdown-2.5.tar.gz +Download-URL: http://pypi.python.org/packages/source/M/Markdown/Markdown-2.5.1.tar.gz Description: This is a Python implementation of John Gruber's Markdown_. It is almost completely compliant with the reference implementation, though there are a few known issues. See Features_ for information diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/docs/change_log.txt new/Markdown-2.5.1/docs/change_log.txt --- old/Markdown-2.5/docs/change_log.txt 2014-08-26 03:30:47.000000000 +0200 +++ new/Markdown-2.5.1/docs/change_log.txt 2014-09-27 00:33:46.000000000 +0200 @@ -7,9 +7,11 @@ Python-Markdown Changelog ========================= -[TBD]: Released version 2.5.0 ([Notes](release-2.5.html)) +Sept 26, 2014: Released version 2.5.1 (a bugfix release). -Feb 16, 2014: Released version 2.4.0 ([Notes](release-2.4.html)) +Sept 12, 2014: Released version 2.5.0 ([Notes](release-2.5.html)). + +Feb 16, 2014: Released version 2.4.0 ([Notes](release-2.4.html)). Mar 22, 2013: Released version 2.3.1 (a bugfix release). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/docs/release-2.5.txt new/Markdown-2.5.1/docs/release-2.5.txt --- old/Markdown-2.5/docs/release-2.5.txt 2014-09-13 02:32:11.000000000 +0200 +++ new/Markdown-2.5.1/docs/release-2.5.txt 2014-09-27 00:35:06.000000000 +0200 @@ -16,10 +16,7 @@ ------------------------------ * Python-Markdown no longer supports Python version 2.6. You must be using Python - versions 2.7, 3.2, 3.3, or 3.4. While Python-Markdown is no longer tested against - Python 2.6, you may be able to get it working if you install a copy of [importlib] - which has been backported for Python 2.6. However, the developers of Python-Markdown - offer no guarentees in that situation. + versions 2.7, 3.2, 3.3, or 3.4. [importlib]: https://pypi.python.org/pypi/importlib @@ -177,7 +174,7 @@ [JSON]: http://json.org/ [PyYAML]: http://pyyaml.org/ -* The [amonition extension][ae] is no longer considered "experimental." +* The [admonition extension][ae] is no longer considered "experimental." [ae]: extensions/admonition.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/markdown/__init__.py new/Markdown-2.5.1/markdown/__init__.py --- old/Markdown-2.5/markdown/__init__.py 2014-09-13 02:32:11.000000000 +0200 +++ new/Markdown-2.5.1/markdown/__init__.py 2014-09-26 04:31:04.000000000 +0200 @@ -221,6 +221,10 @@ # Assume string uses dot syntax (`path.to.some.module`) module = importlib.import_module(ext_name) logger.debug('Successfuly imported extension module "%s".' % ext_name) + # For backward compat (until deprecation) check that this is an extension + if '.' not in ext_name and not (hasattr(module, 'extendMarkdown') or (class_name and hasattr(module, class_name))): + # We have a name conflict (eg: extensions=['tables'] and PyTables is installed) + raise ImportError except ImportError: # Preppend `markdown.extensions.` to name module_name = '.'.join(['markdown.extensions', ext_name]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/markdown/__version__.py new/Markdown-2.5.1/markdown/__version__.py --- old/Markdown-2.5/markdown/__version__.py 2014-09-13 02:40:10.000000000 +0200 +++ new/Markdown-2.5.1/markdown/__version__.py 2014-09-27 00:31:53.000000000 +0200 @@ -5,7 +5,7 @@ # (major, minor, micro, alpha/beta/rc/final, #) # (1, 1, 2, 'alpha', 0) => "1.1.2.dev" # (1, 2, 0, 'beta', 2) => "1.2b2" -version_info = (2, 5, 0, 'final', 0) +version_info = (2, 5, 1, 'final', 0) def _get_version(): " Returns a PEP 386-compliant version number from version_info. " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/markdown/extensions/meta.py new/Markdown-2.5.1/markdown/extensions/meta.py --- old/Markdown-2.5/markdown/extensions/meta.py 2014-08-26 03:30:47.000000000 +0200 +++ new/Markdown-2.5.1/markdown/extensions/meta.py 2014-09-27 00:30:31.000000000 +0200 @@ -31,7 +31,7 @@ def extendMarkdown(self, md, md_globals): """ Add MetaPreprocessor to Markdown instance. """ - md.preprocessors.add("meta", MetaPreprocessor(md), "_begin") + md.preprocessors.add("meta", MetaPreprocessor(md), ">normalize_whitespace") class MetaPreprocessor(Preprocessor): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/markdown/extensions/toc.py new/Markdown-2.5.1/markdown/extensions/toc.py --- old/Markdown-2.5/markdown/extensions/toc.py 2014-08-26 03:30:47.000000000 +0200 +++ new/Markdown-2.5.1/markdown/extensions/toc.py 2014-09-26 04:31:04.000000000 +0200 @@ -216,9 +216,9 @@ "slugify" : [slugify, "Function to generate anchors based on header text - " "Defaults to the headerid ext's slugify function."], - "title" : [None, + "title" : ["", "Title to insert into TOC <div> - " - "Defaults to None"], + "Defaults to an empty string"], "anchorlink" : [0, "1 if header should be a self link - " "Defaults to 0"], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/markdown/inlinepatterns.py new/Markdown-2.5.1/markdown/inlinepatterns.py --- old/Markdown-2.5/markdown/inlinepatterns.py 2014-08-26 03:30:47.000000000 +0200 +++ new/Markdown-2.5.1/markdown/inlinepatterns.py 2014-09-27 00:30:31.000000000 +0200 @@ -75,7 +75,8 @@ inlinePatterns["html"] = HtmlPattern(HTML_RE, md_instance) inlinePatterns["entity"] = HtmlPattern(ENTITY_RE, md_instance) inlinePatterns["not_strong"] = SimpleTextPattern(NOT_STRONG_RE) - inlinePatterns["strong_em"] = DoubleTagPattern(STRONG_EM_RE, 'strong,em') + inlinePatterns["em_strong"] = DoubleTagPattern(EM_STRONG_RE, 'strong,em') + inlinePatterns["strong_em"] = DoubleTagPattern(STRONG_EM_RE, 'em,strong') inlinePatterns["strong"] = SimpleTagPattern(STRONG_RE, 'strong') inlinePatterns["emphasis"] = SimpleTagPattern(EMPHASIS_RE, 'em') if md_instance.smart_emphasis: @@ -100,7 +101,8 @@ ESCAPE_RE = r'\\(.)' # \< EMPHASIS_RE = r'(\*)([^\*]+)\2' # *emphasis* STRONG_RE = r'(\*{2}|_{2})(.+?)\2' # **strong** -STRONG_EM_RE = r'(\*{3}|_{3})(.+?)\2' # ***strong*** +EM_STRONG_RE = r'(\*|_){3}(.+?)\2(.*?)\2{2}' # ***strongem*** or ***em*strong** +STRONG_EM_RE = r'(\*|_){3}(.+?)\2{2}(.*?)\2' # ***strong**em* SMART_EMPHASIS_RE = r'(?<!\w)(_)(?!_)(.+?)(?<!_)\2(?!\w)' # _smart_emphasis_ EMPHASIS_2_RE = r'(_)(.+?)\2' # _emphasis_ LINK_RE = NOIMG + BRK + \ @@ -156,7 +158,7 @@ """ self.pattern = pattern - self.compiled_re = re.compile("^(.*?)%s(.*?)$" % pattern, + self.compiled_re = re.compile("^(.*?)%s(.*?)$" % pattern, re.DOTALL | re.UNICODE) # Api for Markdown to pass safe_mode into instance @@ -210,7 +212,7 @@ return value else: # An etree Element - return text content only - return ''.join(itertext(value)) + return ''.join(itertext(value)) return util.INLINE_PLACEHOLDER_RE.sub(get_stash, text) @@ -228,7 +230,7 @@ if char in self.markdown.ESCAPED_CHARS: return '%s%s%s' % (util.STX, ord(char), util.ETX) else: - return None + return None class SimpleTagPattern(Pattern): @@ -276,6 +278,8 @@ el1 = util.etree.Element(tag1) el2 = util.etree.SubElement(el1, tag2) el2.text = m.group(3) + if len(m.groups())==5: + el2.tail = m.group(4) return el1 @@ -300,7 +304,7 @@ return self.markdown.serializer(value) except: return '\%s' % value - + return util.INLINE_PLACEHOLDER_RE.sub(get_stash, text) @@ -320,7 +324,7 @@ el.set("href", "") if title: - title = dequote(self.unescape(title)) + title = dequote(self.unescape(title)) el.set("title", title) return el @@ -344,19 +348,19 @@ if not self.markdown.safeMode: # Return immediately bipassing parsing. return url - + try: scheme, netloc, path, params, query, fragment = url = urlparse(url) except ValueError: #pragma: no cover # Bad url - so bad it couldn't be parsed. return '' - + locless_schemes = ['', 'mailto', 'news'] allowed_schemes = locless_schemes + ['http', 'https', 'ftp', 'ftps'] if scheme not in allowed_schemes: # Not a known (allowed) scheme. Not safe. return '' - + if netloc == '' and scheme not in locless_schemes: #pragma: no cover # This should not happen. Treat as suspect. return '' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/markdown/treeprocessors.py new/Markdown-2.5.1/markdown/treeprocessors.py --- old/Markdown-2.5/markdown/treeprocessors.py 2014-09-13 02:32:11.000000000 +0200 +++ new/Markdown-2.5.1/markdown/treeprocessors.py 2014-09-27 00:30:31.000000000 +0200 @@ -34,8 +34,8 @@ def run(self, root): """ Subclasses of Treeprocessor should implement a `run` method, which - takes a root ElementTree. This method can return another ElementTree - object, and the existing root ElementTree will be replaced, or it can + takes a root ElementTree. This method can return another ElementTree + object, and the existing root ElementTree will be replaced, or it can modify the current tree and return None. """ pass #pragma: no cover @@ -71,7 +71,7 @@ * index: index, from which we start search Returns: placeholder id and string index, after the found placeholder. - + """ m = self.__placeholder_re.search(data, index) if m: @@ -129,11 +129,10 @@ text = subnode.tail subnode.tail = None - childResult = self.__processPlaceholders(text, subnode) + childResult = self.__processPlaceholders(text, subnode, isText) if not isText and node is not subnode: pos = list(node).index(subnode) - node.remove(subnode) else: pos = 0 @@ -141,7 +140,7 @@ for newChild in childResult: node.insert(pos, newChild) - def __processPlaceholders(self, data, parent): + def __processPlaceholders(self, data, parent, isText=True): """ Process string with placeholders and generate ElementTree tree. @@ -151,7 +150,7 @@ * parent: Element, which contains processing inline data Returns: list with ElementTree elements with applied inline patterns. - + """ def linkText(text): if text: @@ -160,6 +159,11 @@ result[-1].tail += text else: result[-1].tail = text + elif not isText: + if parent.tail: + parent.tail += text + else: + parent.tail = text else: if parent.text: parent.text += text @@ -183,7 +187,7 @@ for child in [node] + list(node): if child.tail: if child.tail.strip(): - self.__processElementText(node, child,False) + self.__processElementText(node, child, False) if child.text: if child.text.strip(): self.__processElementText(child, child) @@ -240,7 +244,7 @@ # We need to process current node too for child in [node] + list(node): if not isString(node): - if child.text: + if child.text: child.text = self.__handleInline(child.text, patternIndex + 1) if child.tail: @@ -288,11 +292,10 @@ if child.tail: tail = self.__handleInline(child.tail) dumby = util.etree.Element('d') - tailResult = self.__processPlaceholders(tail, dumby) - if dumby.text: - child.tail = dumby.text - else: - child.tail = None + child.tail = None + tailResult = self.__processPlaceholders(tail, dumby, False) + if dumby.tail: + child.tail = dumby.tail pos = list(currElement).index(child) + 1 tailResult.reverse() for newChild in tailResult: @@ -304,7 +307,7 @@ if self.markdown.enable_attributes: if element.text and isString(element.text): element.text = \ - inlinepatterns.handleAttributes(element.text, + inlinepatterns.handleAttributes(element.text, element) i = 0 for newChild in lst: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/tests/misc/em_strong_complex.html new/Markdown-2.5.1/tests/misc/em_strong_complex.html --- old/Markdown-2.5/tests/misc/em_strong_complex.html 1970-01-01 01:00:00.000000000 +0100 +++ new/Markdown-2.5.1/tests/misc/em_strong_complex.html 2014-09-27 00:30:31.000000000 +0200 @@ -0,0 +1,14 @@ +test test test test +test test test test +test +test_ +test test_ +test test +test_test test_test +test test test test +test test test test +*test +test +test* +test test +testtest testtest \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/tests/misc/em_strong_complex.txt new/Markdown-2.5.1/tests/misc/em_strong_complex.txt --- old/Markdown-2.5/tests/misc/em_strong_complex.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/Markdown-2.5.1/tests/misc/em_strong_complex.txt 2014-09-27 00:30:31.000000000 +0200 @@ -0,0 +1,27 @@ +___test test__ test test_ + +___test test_ test test__ + +___test___ + +__test___ + +___test_ test___ + +___test_ test__ + +_test_test test_test_ + +***test test** test test* + +***test test* test test** + +**test* + +***test*** + +**test*** + +***test* test** + +*test*test test*test* \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-2.5/tests/test_apis.py new/Markdown-2.5.1/tests/test_apis.py --- old/Markdown-2.5/tests/test_apis.py 2014-09-13 02:32:11.000000000 +0200 +++ new/Markdown-2.5.1/tests/test_apis.py 2014-09-27 00:30:31.000000000 +0200 @@ -289,25 +289,22 @@ def testLoadBadExtension(self): """ Test loading of an Extension with no makeExtension function. """ - _create_fake_extension(name='fake_a', has_factory_func=False) - self.assertRaises(AttributeError, markdown.Markdown, extensions=['fake_a']) + self.assertRaises(AttributeError, markdown.Markdown, extensions=['markdown.util']) def testNonExtension(self): """ Test loading a non Extension object as an extension. """ - _create_fake_extension(name='fake_b', is_wrong_type=True) - self.assertRaises(TypeError, markdown.Markdown, extensions=['fake_b']) + self.assertRaises(TypeError, markdown.Markdown, extensions=[object]) def testBaseExtention(self): """ Test that the base Extension class will raise NotImplemented. """ - _create_fake_extension(name='fake_c') self.assertRaises(NotImplementedError, - markdown.Markdown, extensions=['fake_c']) + markdown.Markdown, extensions=[markdown.extensions.Extension()]) def testMdxExtention(self): """ Test that appending mdx_ raises a PendingDeprecationWarning. """ - _create_fake_extension(name='fake_d', use_old_style=True) + _create_fake_extension(name='fake', use_old_style=True) self.assertRaises(PendingDeprecationWarning, - markdown.Markdown, extensions=['fake_d']) + markdown.Markdown, extensions=['fake']) def testShortNameExtention(self): """ Test that using a short name raises a PendingDeprecationWarning. """ @@ -383,6 +380,20 @@ '\n') +class testElementTailTests(unittest.TestCase): + """ Element Tail Tests """ + def setUp(self): + self.pretty = markdown.treeprocessors.PrettifyTreeprocessor() + + def testBrTailNoNewline(self): + """ Test that last in tree has a new line tail """ + root = markdown.util.etree.Element('root') + br = markdown.util.etree.SubElement(root, 'br') + self.assertEqual(br.tail, None) + self.pretty.run(root) + self.assertEqual(br.tail, "\n") + + class testSerializers(unittest.TestCase): """ Test the html and xhtml serializers. """ @@ -590,7 +601,7 @@ with os.fdopen(fd, 'w') as fp: fp.write(config) - def testExtensonConfigOption(self): + def testExtensionConfigOption(self): config = { 'markdown.extensions.wikilinks': { 'base_url': 'http://example.com/', @@ -606,6 +617,19 @@ self.default_options['extension_configs'] = config self.assertEqual(options, self.default_options) + def textBoolExtensionConfigOption(self): + config = { + 'markdown.extensions.toc': { + 'title': 'Some Title', + 'anchorlink': True, + 'permalink': True + } + } + self.create_config_file(config) + options, logging_level = parse_options(['-c', self.tempfile]) + self.default_options['extension_configs'] = config + self.assertEqual(options, self.default_options) + def testExtensonConfigOptionAsJSON(self): config = { 'markdown.extensions.wikilinks': { @@ -632,4 +656,4 @@ PLACE_MARKER= ~~~footnotes~~~ """ self.create_config_file(config) - self.assertRaises(yaml.YAMLError, parse_options, ['-c', self.tempfile]) \ No newline at end of file + self.assertRaises(yaml.YAMLError, parse_options, ['-c', self.tempfile]) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit go for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package go for openSUSE:Factory checked in at 2014-10-05 20:31:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/go (Old) and /work/SRC/openSUSE:Factory/.go.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "go" Changes: -------- --- /work/SRC/openSUSE:Factory/go/go.changes 2014-09-17 17:25:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.go.new/go.changes 2014-10-05 20:33:26.000000000 +0200 @@ -1,0 +2,31 @@ +Fri Sep 26 13:14:55 UTC 2014 - cbosdonnat(a)suse.com + +- Revert the /usr/share/go/contrib symlink as it caused problems + during update. Moved all go sources to /usr/share/go/contrib/src + instead of /usr/share/go/contrib/src/pkg and created pkg and src + symlinks in contrib to add it to GOPATH + +------------------------------------------------------------------- +Thu Sep 25 12:31:43 UTC 2014 - cbosdonnat(a)suse.com + +- Fixed %go_contribsrcdir value +- Copy temporary macros.go as go.macros to avoid it to be built + +------------------------------------------------------------------- +Mon Sep 22 19:45:17 UTC 2014 - jengelh(a)inai.de + +- Do not modify Source: files, because that makes the .src.rpm + being tied to one specific arch. + +------------------------------------------------------------------- +Tue Sep 16 15:15:20 UTC 2014 - cbosdonnat(a)suse.com + +- Removed extra src folder in /usr/share/go/contrib: the goal is to + transform this folder into a proper entry for GOPATH. This folder + is now linked to %{_libdir}/go/contrib +- go requires gcc to build sources using cgo +- tools-packaging.patch: Allow building cover and vet tools in + $GOROOT_TARGET/pkg/tool instead of $GOROOT/pkg/tool. This will + allow building go tools as a separate package + +------------------------------------------------------------------- New: ---- tools-packaging.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ go.spec ++++++ --- /var/tmp/diff_new_pack.1hTE88/_old 2014-10-05 20:33:27.000000000 +0200 +++ /var/tmp/diff_new_pack.1hTE88/_new 2014-10-05 20:33:27.000000000 +0200 @@ -28,7 +28,7 @@ Source1: go-rpmlintrc Source2: go.sh Source3: macros.go -Source6: go-wiki-gadget.xml +Source4: go-wiki-gadget.xml Source5: README-openSUSE # PATCH-FIX-OPENSUSE add -s flag to 'go install' (don't rebuild/install std libs) Patch1: go-build-dont-reinstall-stdlibs.patch @@ -39,6 +39,8 @@ Patch3: verbose-build.patch # PATCH-FIX-OPENSUSE BNC#776058 Patch4: go-install-dont-reinstall-stdlibs.patch +# PATCH-FIX-OPENSUSE enable writing tools outside $GOROOT/pkg/tool for packaging +Patch5: tools-packaging.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: rpm %if 0%{?suse_version} >= 1210 @@ -53,6 +55,7 @@ BuildRequires: rpm >= 4.11.1 %endif %endif +Requires: gcc Provides: go-devel = %{name}%{version} Provides: go-devel-static = %{name}%{version} Obsoletes: go-devel < %{name}%{version} @@ -95,19 +98,21 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cp %{SOURCE5} . # setup go_arch (BSD-like scheme) +cp %{SOURCE3} go.macros %ifarch %ix86 -sed -i 's|GOARCH|386|' %{SOURCE3} +sed -i 's|GOARCH|386|' go.macros %define go_arch 386 %endif %ifarch x86_64 -sed -i 's|GOARCH|amd64|' %{SOURCE3} +sed -i 's|GOARCH|amd64|' go.macros %define go_arch amd64 %endif %ifarch %arm -sed -i 's|GOARCH|arm|' %{SOURCE3} +sed -i 's|GOARCH|arm|' go.macros %define go_arch arm %endif @@ -145,10 +150,12 @@ install -Dm644 misc/vim/ftdetect/gofiletype.vim %{buildroot}%{_datadir}/vim/site/ftdetect/gofiletype.vim # locations for third party libraries, see README-openSUSE for info about locations. -install -d %{buildroot}%{_libdir}/go/contrib/pkg/linux_%{go_arch} -install -d %{buildroot}%{_datadir}/go/contrib/src/pkg -install -d %{buildroot}%{_datadir}/go/contrib/src/cmd -install -Dm644 README-openSUSE %{buildroot}%{_libdir}/go/contrib/ +install -d %{buildroot}%{_datadir}/go/contrib +install -d $GOROOT/contrib/pkg/linux_%{go_arch} +ln -s %{_libdir}/%{name}/contrib/pkg/ %{buildroot}%{_datadir}/go/contrib/pkg +install -d %{buildroot}%{_datadir}/go/contrib/cmd +install -d %{buildroot}%{_datadir}/go/contrib/src +install -Dm644 README-openSUSE $GOROOT/contrib/ ln -s %{_libdir}/go/contrib/README-openSUSE %{buildroot}%{_datadir}/go/contrib/README-openSUSE # source files for go install, godoc, etc @@ -180,7 +187,7 @@ rm -f misc/kate/go.xml # install RPM macros ($GOARCH prepared in %%prep section) -install -Dm644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.go +install -Dm644 go.macros %{buildroot}%{_sysconfdir}/rpm/macros.go # break hard links rm %{buildroot}%{_libdir}/go/pkg/linux_%{go_arch}/{cgocall,runtime}.h ++++++ go.sh ++++++ --- /var/tmp/diff_new_pack.1hTE88/_old 2014-10-05 20:33:28.000000000 +0200 +++ /var/tmp/diff_new_pack.1hTE88/_new 2014-10-05 20:33:28.000000000 +0200 @@ -14,9 +14,9 @@ esac export GOROOT=/usr/$libdir/go export GOBIN=/usr/bin -export GOPATH=$GOROOT/contrib +export GOPATH=/usr/share/go/contrib if [ `id -u` != 0 ]; then - export GOPATH=$HOME/go:$GOROOT/contrib + export GOPATH=$HOME/go:/usr/share/go/contrib export GOBIN=$HOME/go/bin fi ++++++ macros.go ++++++ --- /var/tmp/diff_new_pack.1hTE88/_old 2014-10-05 20:33:28.000000000 +0200 +++ /var/tmp/diff_new_pack.1hTE88/_new 2014-10-05 20:33:28.000000000 +0200 @@ -13,7 +13,7 @@ %go_sitedir %{_libdir}/go/pkg %go_sitearch %{_libdir}/go/pkg/linux_%{go_arch} %go_contribdir %{_libdir}/go/contrib/pkg/linux_%{go_arch} -%go_contribsrcdir %{_datadir}/go/contrib/src/pkg +%go_contribsrcdir %{_datadir}/go/contrib/src/ %go_tooldir %{_datadir}/go/pkg/tool/linux_%{go_arch} %go_exclusivearch \ @@ -181,4 +181,4 @@ %{-r:Requires: %{-r*}} \ %description %{-n:-n %{-n*}-}doc \ This package provides API, examples and documentation \ -for package %{name}. \ No newline at end of file +for package %{name}. ++++++ tools-packaging.patch ++++++ Index: go/src/cmd/go/pkg.go =================================================================== --- go.orig/src/cmd/go/pkg.go +++ go/src/cmd/go/pkg.go @@ -398,7 +398,13 @@ func (p *Package) load(stk *importStack, if goTools[p.ImportPath] == toTool { // This is for 'go tool'. // Override all the usual logic and force it into the tool directory. - p.target = filepath.Join(gorootPkg, "tool", full) + // If GOROOT_TARGET is set, then write to it for packaging purpose + gorootTarget := os.Getenv("GOROOT_TARGET") + if gorootTarget == "" { + p.target = filepath.Join(gorootPkg, "tool", full) + } else { + p.target = filepath.Join(gorootTarget, "pkg/tool", full) + } } if p.target != "" && buildContext.GOOS == "windows" { p.target += ".exe" -- 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 for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2014-10-05 20:31:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2014-09-23 10:46:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2014-10-05 20:33:24.000000000 +0200 @@ -1,0 +2,25 @@ +Thu Oct 2 15:28:40 MDT 2014 - jfehlig(a)suse.com + +- spec: Remove gpg-offline build dependency and use of gpg_verify + to verify tarball since this task can be performed by source + services + +------------------------------------------------------------------- +Wed Oct 1 11:53:17 MDT 2014 - jfehlig(a)suse.com + +- Update to libvirt 1.2.9 + - Introduce virNodeAllocPages + - event: introduce new event for tunable values + - Add support for fetching statistics of completed jobs + - CVE-2014-3657: domain_conf: fix domain deadlock + - CVE-2014-3633: qemu: blkiotune: Use correct definition when + looking up disk + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Drop upstream patches: 3e745e8f-CVE-2014-3633.patch, + libvirt-guests-wait-for-ntp.patch +- Verify tarball with associated .asc file + Add: libvirt.keyring, libvirt-1.2.9.tar.gz.asc + Use upstream .gz tarball instead of locally generated .bz2 + +------------------------------------------------------------------- Old: ---- 3e745e8f-CVE-2014-3633.patch libvirt-1.2.8.tar.bz2 libvirt-guests-wait-for-ntp.patch New: ---- libvirt-1.2.9.tar.gz libvirt-1.2.9.tar.gz.asc libvirt.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -235,7 +235,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 1.2.8 +Version: 1.2.9 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -424,14 +424,14 @@ BuildRequires: numad %endif -Source0: %{name}-%{version}.tar.bz2 -Source1: libvirtd.init -Source2: libvirtd-relocation-server.fw +Source0: %{name}-%{version}.tar.gz +Source1: %{name}-%{version}.tar.gz.asc +Source2: %{name}.keyring +Source3: libvirtd.init +Source4: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches -Patch0: 3e745e8f-CVE-2014-3633.patch # Patches pending upstream review -Patch100: libvirt-guests-wait-for-ntp.patch # Need to go upstream Patch150: xen-name-for-devid.patch Patch151: xen-pv-cdrom.patch @@ -951,8 +951,6 @@ %prep %setup -q -%patch0 -p1 -%patch100 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 @@ -1288,7 +1286,7 @@ %if %{with_systemd} ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rclibvirtd %else -install %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/init.d/libvirtd +install %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/init.d/libvirtd ln -s /etc/init.d/libvirtd $RPM_BUILD_ROOT%{_sbindir}/rclibvirtd %endif mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd @@ -1305,7 +1303,7 @@ #install firewall definitions format is described here: #/usr/share/SuSEfirewall2/services/TEMPLATE mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir} -install -m 644 %{S:2} $RPM_BUILD_ROOT/%{_fwdefdir}/libvirtd-relocation-server +install -m 644 %{S:4} $RPM_BUILD_ROOT/%{_fwdefdir}/libvirtd-relocation-server %endif %if %{with_systemd} rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirt-guests ++++++ apparmor-no-mount.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.8/examples/apparmor/libvirt-lxc +Index: libvirt-1.2.9/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-1.2.8.orig/examples/apparmor/libvirt-lxc -+++ libvirt-1.2.8/examples/apparmor/libvirt-lxc +--- libvirt-1.2.9.orig/examples/apparmor/libvirt-lxc ++++ libvirt-1.2.9/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include <abstractions/base> ++++++ blockcopy-check-dst-identical-device.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -11,21 +11,23 @@ src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-1.2.8/src/qemu/qemu_driver.c +Index: libvirt-1.2.9/src/qemu/qemu_driver.c =================================================================== ---- libvirt-1.2.8.orig/src/qemu/qemu_driver.c -+++ libvirt-1.2.8/src/qemu/qemu_driver.c -@@ -15357,6 +15357,13 @@ qemuDomainBlockCopy(virDomainObjPtr vm, +--- libvirt-1.2.9.orig/src/qemu/qemu_driver.c ++++ libvirt-1.2.9/src/qemu/qemu_driver.c +@@ -15589,6 +15589,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("non-file destination not supported yet")); } - - /* Prepare the destination file. */ -+ if (STREQ_NULLABLE(realpath(disk->src->path, NULL), realpath(dest, NULL))) { ++ ++ if (STREQ_NULLABLE(realpath(disk->src->path, NULL), ++ realpath(mirror->path, NULL))) { + virReportError(VIR_ERR_INVALID_ARG, + _("destination '%s' is the same as disk '%s' source"), -+ dest, path); ++ mirror->path, path); + goto endjob; + } + - if (stat(dest, &st) < 0) { + if (stat(mirror->path, &st) < 0) { if (errno != ENOENT) { virReportSystemError(errno, _("unable to stat for disk %s: %s"), ++++++ disable-virCgroupGetPercpuStats-test.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.8/tests/vircgrouptest.c +Index: libvirt-1.2.9/tests/vircgrouptest.c =================================================================== ---- libvirt-1.2.8.orig/tests/vircgrouptest.c -+++ libvirt-1.2.8/tests/vircgrouptest.c +--- libvirt-1.2.9.orig/tests/vircgrouptest.c ++++ libvirt-1.2.9/tests/vircgrouptest.c @@ -33,7 +33,6 @@ # include "virlog.h" # include "virfile.h" ++++++ fix-pci-attach-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -8,10 +8,10 @@ This patch changes the xend driver to always call 'device_configure' for PCI devices to be consistent with the usage in the xen tools. -Index: libvirt-1.2.8/src/xen/xend_internal.c +Index: libvirt-1.2.9/src/xen/xend_internal.c =================================================================== ---- libvirt-1.2.8.orig/src/xen/xend_internal.c -+++ libvirt-1.2.8/src/xen/xend_internal.c +--- libvirt-1.2.9.orig/src/xen/xend_internal.c ++++ libvirt-1.2.9/src/xen/xend_internal.c @@ -2221,6 +2221,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr virBuffer buf = VIR_BUFFER_INITIALIZER; char class[8], ref[80]; ++++++ install-apparmor-profiles.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.8/examples/apparmor/Makefile.am +Index: libvirt-1.2.9/examples/apparmor/Makefile.am =================================================================== ---- libvirt-1.2.8.orig/examples/apparmor/Makefile.am -+++ libvirt-1.2.8/examples/apparmor/Makefile.am +--- libvirt-1.2.9.orig/examples/apparmor/Makefile.am ++++ libvirt-1.2.9/examples/apparmor/Makefile.am @@ -19,10 +19,22 @@ EXTRA_DIST= \ TEMPLATE.lxc \ libvirt-qemu \ @@ -27,10 +27,10 @@ apparmordir = $(sysconfdir)/apparmor.d/ apparmor_DATA = \ usr.lib.libvirt.virt-aa-helper \ -Index: libvirt-1.2.8/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-1.2.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== --- /dev/null -+++ libvirt-1.2.8/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-1.2.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in @@ -0,0 +1,48 @@ +# Last Modified: Mon Apr 5 15:10:27 2010 +#include <tunables/global> @@ -80,10 +80,10 @@ + /**.[iI][sS][oO] r, + /**/disk{,.*} r, +} -Index: libvirt-1.2.8/examples/apparmor/usr.sbin.libvirtd.in +Index: libvirt-1.2.9/examples/apparmor/usr.sbin.libvirtd.in =================================================================== --- /dev/null -+++ libvirt-1.2.8/examples/apparmor/usr.sbin.libvirtd.in ++++ libvirt-1.2.9/examples/apparmor/usr.sbin.libvirtd.in @@ -0,0 +1,68 @@ +# Last Modified: Mon Apr 5 15:03:58 2010 +#include <tunables/global> @@ -153,9 +153,9 @@ + change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, + +} -Index: libvirt-1.2.8/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-1.2.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-1.2.8.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-1.2.9.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +++ /dev/null @@ -1,48 +0,0 @@ -# Last Modified: Mon Apr 5 15:10:27 2010 @@ -206,9 +206,9 @@ - /**.[iI][sS][oO] r, - /**/disk{,.*} r, -} -Index: libvirt-1.2.8/examples/apparmor/usr.sbin.libvirtd +Index: libvirt-1.2.9/examples/apparmor/usr.sbin.libvirtd =================================================================== ---- libvirt-1.2.8.orig/examples/apparmor/usr.sbin.libvirtd +--- libvirt-1.2.9.orig/examples/apparmor/usr.sbin.libvirtd +++ /dev/null @@ -1,63 +0,0 @@ -# Last Modified: Mon Apr 5 15:03:58 2010 ++++++ libvirt-guests-init-script.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -1,9 +1,9 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-1.2.8/tools/libvirt-guests.init.in +Index: libvirt-1.2.9/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.2.8.orig/tools/libvirt-guests.init.in -+++ libvirt-1.2.8/tools/libvirt-guests.init.in +--- libvirt-1.2.9.orig/tools/libvirt-guests.init.in ++++ libvirt-1.2.9/tools/libvirt-guests.init.in @@ -3,15 +3,15 @@ # the following is the LSB init header # @@ -28,10 +28,10 @@ ### END INIT INFO # the following is chkconfig init header -Index: libvirt-1.2.8/tools/libvirt-guests.sh.in +Index: libvirt-1.2.9/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.2.8.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.2.8/tools/libvirt-guests.sh.in +--- libvirt-1.2.9.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.2.9/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -189,10 +189,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-1.2.8/tools/libvirt-guests.sysconf +Index: libvirt-1.2.9/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.2.8.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.2.8/tools/libvirt-guests.sysconf +--- libvirt-1.2.9.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.2.9/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.8/src/cpu/cpu_map.xml +Index: libvirt-1.2.9/src/cpu/cpu_map.xml =================================================================== ---- libvirt-1.2.8.orig/src/cpu/cpu_map.xml -+++ libvirt-1.2.8/src/cpu/cpu_map.xml +--- libvirt-1.2.9.orig/src/cpu/cpu_map.xml ++++ libvirt-1.2.9/src/cpu/cpu_map.xml @@ -627,5 +627,15 @@ <pvr value='0x004b0100'/> </model> ++++++ libvirt-ppc64le-support.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -1,8 +1,8 @@ -Index: libvirt-1.2.8/src/conf/domain_conf.c +Index: libvirt-1.2.9/src/conf/domain_conf.c =================================================================== ---- libvirt-1.2.8.orig/src/conf/domain_conf.c -+++ libvirt-1.2.8/src/conf/domain_conf.c -@@ -9690,7 +9690,8 @@ virDomainVideoDefaultType(const virDomai +--- libvirt-1.2.9.orig/src/conf/domain_conf.c ++++ libvirt-1.2.9/src/conf/domain_conf.c +@@ -9863,7 +9863,8 @@ virDomainVideoDefaultType(const virDomai (STREQ(def->os.type, "xen") || STREQ(def->os.type, "linux"))) return VIR_DOMAIN_VIDEO_TYPE_XEN; @@ -12,10 +12,10 @@ return VIR_DOMAIN_VIDEO_TYPE_VGA; else return VIR_DOMAIN_VIDEO_TYPE_CIRRUS; -Index: libvirt-1.2.8/src/cpu/cpu_powerpc.c +Index: libvirt-1.2.9/src/cpu/cpu_powerpc.c =================================================================== ---- libvirt-1.2.8.orig/src/cpu/cpu_powerpc.c -+++ libvirt-1.2.8/src/cpu/cpu_powerpc.c +--- libvirt-1.2.9.orig/src/cpu/cpu_powerpc.c ++++ libvirt-1.2.9/src/cpu/cpu_powerpc.c @@ -38,7 +38,7 @@ VIR_LOG_INIT("cpu.cpu_powerpc"); @@ -25,21 +25,21 @@ struct ppc_vendor { char *name; -Index: libvirt-1.2.8/src/qemu/qemu_capabilities.c +Index: libvirt-1.2.9/src/qemu/qemu_capabilities.c =================================================================== ---- libvirt-1.2.8.orig/src/qemu/qemu_capabilities.c -+++ libvirt-1.2.8/src/qemu/qemu_capabilities.c -@@ -631,7 +631,8 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr +--- libvirt-1.2.9.orig/src/qemu/qemu_capabilities.c ++++ libvirt-1.2.9/src/qemu/qemu_capabilities.c +@@ -632,7 +632,8 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr if (qemuCaps->arch == VIR_ARCH_I686 || - qemuCaps->arch == VIR_ARCH_X86_64) + qemuCaps->arch == VIR_ARCH_X86_64) { parse = virQEMUCapsParseX86Models; -- else if (qemuCaps->arch == VIR_ARCH_PPC64) -+ else if (qemuCaps->arch == VIR_ARCH_PPC64 || -+ qemuCaps->arch == VIR_ARCH_PPC64LE) +- } else if (qemuCaps->arch == VIR_ARCH_PPC64) { ++ } else if (qemuCaps->arch == VIR_ARCH_PPC64 || ++ qemuCaps->arch == VIR_ARCH_PPC64LE) { parse = virQEMUCapsParsePPCModels; - else { + } else { VIR_DEBUG("don't know how to parse %s CPU models", -@@ -1996,7 +1997,8 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCa +@@ -2001,7 +2002,8 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCa return true; if (def->os.arch == VIR_ARCH_PPC || @@ -49,7 +49,7 @@ /* * Usage of pci.0 naming: * -@@ -3567,7 +3569,9 @@ virQEMUCapsSupportsChardev(virDomainDefP +@@ -3571,7 +3573,9 @@ virQEMUCapsSupportsChardev(virDomainDefP !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) return false; @@ -60,41 +60,41 @@ /* only pseries need -device spapr-vty with -chardev */ return (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO); -Index: libvirt-1.2.8/src/qemu/qemu_command.c +Index: libvirt-1.2.9/src/qemu/qemu_command.c =================================================================== ---- libvirt-1.2.8.orig/src/qemu/qemu_command.c -+++ libvirt-1.2.8/src/qemu/qemu_command.c -@@ -703,7 +703,8 @@ qemuSetSCSIControllerModel(virDomainDefP +--- libvirt-1.2.9.orig/src/qemu/qemu_command.c ++++ libvirt-1.2.9/src/qemu/qemu_command.c +@@ -713,7 +713,8 @@ qemuSetSCSIControllerModel(virDomainDefP return -1; } } else { - if ((def->os.arch == VIR_ARCH_PPC64) && + if ((def->os.arch == VIR_ARCH_PPC64 || -+ def->os.arch == VIR_ARCH_PPC64LE) && - STREQ(def->os.machine, "pseries")) { ++ def->os.arch == VIR_ARCH_PPC64LE) && + STRPREFIX(def->os.machine, "pseries")) { *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI; } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) { -@@ -1250,7 +1251,8 @@ int qemuDomainAssignSpaprVIOAddresses(vi +@@ -1260,7 +1261,8 @@ int qemuDomainAssignSpaprVIOAddresses(vi for (i = 0; i < def->nserials; i++) { if (def->serials[i]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && - (def->os.arch == VIR_ARCH_PPC64) && + (def->os.arch == VIR_ARCH_PPC64 || -+ def->os.arch == VIR_ARCH_PPC64LE) && - STREQ(def->os.machine, "pseries")) ++ def->os.arch == VIR_ARCH_PPC64LE) && + STRPREFIX(def->os.machine, "pseries")) def->serials[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; if (qemuAssignSpaprVIOAddress(def, &def->serials[i]->info, -@@ -1259,7 +1261,8 @@ int qemuDomainAssignSpaprVIOAddresses(vi +@@ -1269,7 +1271,8 @@ int qemuDomainAssignSpaprVIOAddresses(vi } if (def->nvram) { - if (def->os.arch == VIR_ARCH_PPC64 && + if ((def->os.arch == VIR_ARCH_PPC64 || -+ def->os.arch == VIR_ARCH_PPC64LE) && - STREQ(def->os.machine, "pseries")) ++ def->os.arch == VIR_ARCH_PPC64LE) && + STRPREFIX(def->os.machine, "pseries")) def->nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; if (qemuAssignSpaprVIOAddress(def, &def->nvram->info, -@@ -4147,7 +4150,8 @@ qemuBuildUSBControllerDevStr(virDomainDe +@@ -4191,7 +4194,8 @@ qemuBuildUSBControllerDevStr(virDomainDe model = def->model; if (model == -1) { @@ -104,7 +104,7 @@ model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; else model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI; -@@ -8176,7 +8180,8 @@ qemuBuildCommandLine(virConnectPtr conn, +@@ -8421,7 +8425,8 @@ qemuBuildCommandLine(virConnectPtr conn, !qemuDomainMachineIsQ35(def) && (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) || (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI) && @@ -114,71 +114,79 @@ if (usblegacy) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Multiple legacy USB controllers are " -@@ -9366,7 +9371,8 @@ qemuBuildCommandLine(virConnectPtr conn, +@@ -9619,7 +9624,8 @@ qemuBuildCommandLine(virConnectPtr conn, } if (def->nvram) { - if (def->os.arch == VIR_ARCH_PPC64 && + if ((def->os.arch == VIR_ARCH_PPC64 || -+ def->os.arch == VIR_ARCH_PPC64LE) && - STREQ(def->os.machine, "pseries")) { ++ def->os.arch == VIR_ARCH_PPC64LE) && + STRPREFIX(def->os.machine, "pseries")) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVRAM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", -@@ -9478,7 +9484,8 @@ qemuBuildSerialChrDeviceStr(char **devic +@@ -9737,7 +9743,8 @@ qemuBuildSerialChrDeviceStr(char **devic { virBuffer cmd = VIR_BUFFER_INITIALIZER; -- if ((arch == VIR_ARCH_PPC64) && STREQ(machine, "pseries")) { +- if ((arch == VIR_ARCH_PPC64) && STRPREFIX(machine, "pseries")) { + if ((arch == VIR_ARCH_PPC64 || -+ arch == VIR_ARCH_PPC64LE) && STREQ(machine, "pseries")) { ++ arch == VIR_ARCH_PPC64LE) && STRPREFIX(machine, "pseries")) { if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) { virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s", -@@ -9900,7 +9907,8 @@ qemuParseCommandLineDisk(virDomainXMLOpt +@@ -10159,8 +10166,9 @@ qemuParseCommandLineDisk(virDomainXMLOpt if (VIR_ALLOC(def->src) < 0) goto error; - if (((dom->os.arch == VIR_ARCH_PPC64) && +- dom->os.machine && STRPREFIX(dom->os.machine, "pseries"))) + if (((dom->os.arch == VIR_ARCH_PPC64 || -+ dom->os.arch == VIR_ARCH_PPC64LE) && - dom->os.machine && STREQ(dom->os.machine, "pseries"))) ++ dom->os.arch == VIR_ARCH_PPC64LE) && ++ dom->os.machine && STRPREFIX(dom->os.machine, "pseries"))) def->bus = VIR_DOMAIN_DISK_BUS_SCSI; else -@@ -9992,7 +10000,8 @@ qemuParseCommandLineDisk(virDomainXMLOpt + def->bus = VIR_DOMAIN_DISK_BUS_IDE; +@@ -10252,7 +10260,8 @@ qemuParseCommandLineDisk(virDomainXMLOpt } else if (STREQ(keywords[i], "if")) { if (STREQ(values[i], "ide")) { def->bus = VIR_DOMAIN_DISK_BUS_IDE; - if (((dom->os.arch == VIR_ARCH_PPC64) && + if (((dom->os.arch == VIR_ARCH_PPC64 || -+ dom->os.arch == VIR_ARCH_PPC64LE) && - dom->os.machine && STREQ(dom->os.machine, "pseries"))) { ++ dom->os.arch == VIR_ARCH_PPC64LE) && + dom->os.machine && STRPREFIX(dom->os.machine, "pseries"))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("pseries systems do not support ide devices '%s'"), val); -@@ -11233,7 +11242,8 @@ qemuParseCommandLine(virCapsPtr qemuCaps - disk->src->type = VIR_STORAGE_TYPE_FILE; +@@ -11497,8 +11506,9 @@ qemuParseCommandLine(virCapsPtr qemuCaps + } if (STREQ(arg, "-cdrom")) { disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM; - if (((def->os.arch == VIR_ARCH_PPC64) && +- def->os.machine && STRPREFIX(def->os.machine, "pseries"))) + if (((def->os.arch == VIR_ARCH_PPC64 || -+ def->os.arch == VIR_ARCH_PPC64LE) && - def->os.machine && STREQ(def->os.machine, "pseries"))) ++ def->os.arch == VIR_ARCH_PPC64LE) && ++ def->os.machine && STRPREFIX(def->os.machine, "pseries"))) disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; if (VIR_STRDUP(disk->dst, "hdc") < 0) -@@ -11249,7 +11259,8 @@ qemuParseCommandLine(virCapsPtr qemuCaps + goto error; +@@ -11513,9 +11523,10 @@ qemuParseCommandLine(virCapsPtr qemuCaps disk->bus = VIR_DOMAIN_DISK_BUS_IDE; else disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; - if (((def->os.arch == VIR_ARCH_PPC64) && -+ if (((def->os.arch == VIR_ARCH_PPC64 || -+ def->os.arch == VIR_ARCH_PPC64LE) && - def->os.machine && STREQ(def->os.machine, "pseries"))) - disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; +- def->os.machine && STRPREFIX(def->os.machine, "pseries"))) +- disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; ++ if (((def->os.arch == VIR_ARCH_PPC64 || ++ def->os.arch == VIR_ARCH_PPC64LE) && ++ def->os.machine && STRPREFIX(def->os.machine, "pseries"))) ++ disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; } -Index: libvirt-1.2.8/src/qemu/qemu_domain.c + if (VIR_STRDUP(disk->dst, arg + 1) < 0) + goto error; +Index: libvirt-1.2.9/src/qemu/qemu_domain.c =================================================================== ---- libvirt-1.2.8.orig/src/qemu/qemu_domain.c -+++ libvirt-1.2.8/src/qemu/qemu_domain.c -@@ -754,6 +754,7 @@ qemuDomainDefPostParse(virDomainDefPtr d +--- libvirt-1.2.9.orig/src/qemu/qemu_domain.c ++++ libvirt-1.2.9/src/qemu/qemu_domain.c +@@ -980,6 +980,7 @@ qemuDomainDefPostParse(virDomainDefPtr d break; case VIR_ARCH_PPC64: ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.8/configure.ac +Index: libvirt-1.2.9/configure.ac =================================================================== ---- libvirt-1.2.8.orig/configure.ac -+++ libvirt-1.2.8/configure.ac +--- libvirt-1.2.9.orig/configure.ac ++++ libvirt-1.2.9/configure.ac @@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL @@ -10,7 +10,7 @@ LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS -@@ -2454,11 +2455,12 @@ if test "$with_libvirtd" = "no" ; then +@@ -2456,11 +2457,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi @@ -26,7 +26,7 @@ esac if test "$with_interface" = "yes" ; then -@@ -2880,6 +2882,7 @@ LIBVIRT_RESULT_FUSE +@@ -2882,6 +2884,7 @@ LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_HAL LIBVIRT_RESULT_NETCF @@ -34,11 +34,11 @@ LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-1.2.8/src/Makefile.am +Index: libvirt-1.2.9/src/Makefile.am =================================================================== ---- libvirt-1.2.8.orig/src/Makefile.am -+++ libvirt-1.2.8/src/Makefile.am -@@ -823,6 +823,10 @@ if WITH_NETCF +--- libvirt-1.2.9.orig/src/Makefile.am ++++ libvirt-1.2.9/src/Makefile.am +@@ -826,6 +826,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif WITH_NETCF @@ -49,7 +49,7 @@ if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1458,10 +1462,15 @@ if WITH_NETCF +@@ -1465,10 +1469,15 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) else ! WITH_NETCF @@ -65,11 +65,11 @@ endif ! WITH_NETCF if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la -Index: libvirt-1.2.8/tools/virsh.c +Index: libvirt-1.2.9/tools/virsh.c =================================================================== ---- libvirt-1.2.8.orig/tools/virsh.c -+++ libvirt-1.2.8/tools/virsh.c -@@ -3320,6 +3320,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE +--- libvirt-1.2.9.orig/tools/virsh.c ++++ libvirt-1.2.9/tools/virsh.c +@@ -3340,6 +3340,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -78,10 +78,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.2.8/src/interface/interface_backend_netcf.c +Index: libvirt-1.2.9/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.2.8.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.2.8/src/interface/interface_backend_netcf.c +--- libvirt-1.2.9.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.2.9/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include <config.h> @@ -165,10 +165,10 @@ return 0; } -Index: libvirt-1.2.8/src/interface/interface_driver.c +Index: libvirt-1.2.9/src/interface/interface_driver.c =================================================================== ---- libvirt-1.2.8.orig/src/interface/interface_driver.c -+++ libvirt-1.2.8/src/interface/interface_driver.c +--- libvirt-1.2.9.orig/src/interface/interface_driver.c ++++ libvirt-1.2.9/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -186,10 +186,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-1.2.8/m4/virt-netcontrol.m4 +Index: libvirt-1.2.9/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.2.8/m4/virt-netcontrol.m4 ++++ libvirt-1.2.9/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl ++++++ libvirt.keyring ++++++ user: "Daniel Veillard (Red Hat work email) <veillard(a)redhat.com>" 1024-bit DSA key, ID DE95BC1F, created 2000-05-31 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: SKS 1.1.4 Comment: Hostname: pgp.mit.edu mQGiBDk1EfQRBACMYQsU1LMs37qOMMJhTkfyb5aruPapu8ICNR4kNk36jT/ld7oN/0xtqM/e 2S9VOzAd165POeEobxTXN234MOhj6PM9uJNOgAq1N1k1eWhGpVw2HIYsb40BHgKVf9mdrv73 75L18Sb8qv3CcBhJfK8oW0Zv2oeruWFDpsMr9ULxxwCgmjapuDrJDZN7HEtOCcPF8CoNTG8D +wedGbKLvXg6NE5UyrkV3qfYwrPai84EsPY1VaWemF+hPch+14r0CUIOVADX87HaIBsTmGZ/ u6Ks9ZYALVZbwjQcyNp7MP4ZmvIpfHXdxgLJ+9DbKs6yTlgA1moUSERyfGq/kMC9nq3dVYgm YmxxRuO8/eVKufvStnxhIr/av3o3A/0T4/hPXT2N4WCpvpCxKDIPy9/pqXcYjSEVbS1lfYP6 zfxNDKwuF2j4gRWmunJnPowIGx0+Zhl1dc68B6QOgxqenJNkNbSKUUm23MlzSeT6zyyAJcXW ///zxZ7t7Yq4L9+X6FQtJ8D7kbcB/NQv93UqZKnUplD+35b/xM6zP6UqerQoRGFuaWVsIFZl aWxsYXJkIDxEYW5pZWwuVmVpbGxhcmRAdzMub3JnPohGBBARAgAGBQI5ejQrAAoJEMzzb5Mo I0StyzsAoJDVaCAEqSWJWDwDrm1/NSTz6BqhAJ4kogPqBKq1/NesIIeDwdckRdd3qIhGBBAR AgAGBQI5ejRvAAoJEB1KYQ5pci3uiOAAnjzeSHTAubogcX0HkSebDwhdUetbAKCOFTpvcVkm VW47QfREL9NOtPhUZYhGBBARAgAGBQI5fZl/AAoJEDn49iWv7v6A3yYAoLWf6YQ6TD7xf1rW rbGYhTMZMQ10AKCk4pYLsx6iFRsfcYfFo9JcYi+XMIhGBBARAgAGBQI5fvi8AAoJECQ/IKRD vnVEZnYAni8Q6dFwrJAk6FjVWshDwFIuOULRAJ9NTGm+R1xJpVQERP4IaqLTpDoAEYhGBBAR AgAGBQI5f8DjAAoJEHAzMIEIbIgD2AcAnA47eisX50dYaO90z3jCgCK9Ba9rAKDRxSvuzeTH vWMod/4GqGJWLoyOLIhGBBARAgAGBQI5gOP4AAoJEDmVGBY0lpqJF3MAn1gez3jx9scwRTz1 YZxV8jFb973qAKC2iS4Ldys348K/deYKbYeEIqbrJIhGBBARAgAGBQI6NSaoAAoJEDdlHuot pA0HfZoAoIDREKiALlsoejv/qHI91VKoMHG5AKCwVG/WeJidhynY2OU1RC6QOq2KmYhGBBAR AgAGBQI7gX2lAAoJELvolyhq/bLown0AoMkKpTVkC4D3S4B32nQVeVGLOIweAKDcaxzBok3N qUM/A/gGn4y2WzqHY4hGBBARAgAGBQI7gY+/AAoJEFJHr8cBuaFyKAkAoJm0MMByKDb4Clyu wrxOCQsGnLVIAJ9Z/zrniNW9nKK4/tEspdyv4TLhGYhGBBARAgAGBQI7gZJPAAoJEKA6cWcs inaRsk0AnjmiJWmep/o9AFoPYPtjjK5vNuhcAJ4u9C53x4d3z4RdyG2FnbWjMIeiAYhGBBAR AgAGBQI75UlyAAoJEJ7fge5GzXZ0QqsAniGAQUqPvjapeKPH0G3VkwhX1qWUAJ9hgrsrVvAV eXj+s9Bef7Pyl0wD3YhGBBARAgAGBQI8YSzuAAoJEDlhuoU154VchA4AoKnX9fEFkB8ReQox jlxWLafErH7uAJ0QVxy9rL32p0PFwC6Qn4V6wmIuJIhGBBARAgAGBQI+ZTRLAAoJEFQUZr6x LcGbCCMAniqod8Yz/F3SqXWldryKWOm6HNitAJ9d3w8KY2C4xCNzSxBmt7VDJTAkU4hGBBAR AgAGBQI/gC4MAAoJEHV4bFtSgTOwzJEAnjD2Ak0DOo2mIAfd1VMOsdnu8cK7AJsGJwgyAp9T M/nOtxGly0IdHKMhvYhGBBMRAgAGBQI+ZTceAAoJEFHEeWWe4Un9z/cAnjduT77cVlkKYlIr PHTa/l9r5p7tAJsFajItfqyDhhd/JExUz7nS/ZxecIhWBBMRAgAWBQI5NRH0BAsKBAMDFQMC AxYCAQIXgAAKCRBGBril3pW8HyjYAJ0bg3uZHA+/f974QtI0VE+0uKRpDACfTkTeyy9yyRzO OSzPcoyLuvFDru6IXgQTEQIAFgUCOTUR9AQLCgQDAxUDAgMWAgECF4AAEgkQRga4pd6VvB8H ZUdQRwABASjYAJ0bg3uZHA+/f974QtI0VE+0uKRpDACfTkTeyy9yyRzOOSzPcoyLuvFDru6J ARwEEAECAAYFAj+ALf0ACgkQ4TXeg5d+zEV/fAf/Ru604Jm6N7c1RbRJkAKP2jhLPe+8f8Ln BCtZqeRt832WvAezrx0A46MXUMLulIqsHeMCu6N8AU+I5XvESR/XII5Mce2GMgQNRW33xwYb ChLOfhFjcrcYIbSXl78IkJL0830qwJoaL4TuPruKEY/egNHRwbYel7MSdpLsP8EZ6RoArxCX qzhQGeRfe1FN48tLcxIpy+h8+z9mKlbzbvwNcb1g9Z5z0wL5QXWOqOObPz76UWDqxCXLePDw bTtNkPllSMfd4QW52pgFe3vTBf9C+V6Z2b6OoRHB8a3wu0UctF9GmdeQLrrMHbpwAd1f4BLC uQW2seVlCFDkEgLxMBkaF4kCHAQQAQIABgUCU1n6lwAKCRBZXlskaUZz7fPqD/sHP9Jly99g 0lKnXeihGJlOGXSIoSu3tjR3m7lEXsPnu5Gjan9FmMouG6HSFcNpIutEjY664NCpc9k8me1y bUBhUDgFPbOL9YOf0P9Jf3Pv0dGyERKczw/ZDK9URiRLuuSgkn8yQI2q8QKZYBTleB9Iy8Nr +VkQfWQpA/SgaUlM0nu3mkr6jKzXJmBrYDJIl0LAUjnZlSWB/ZBhBl+tqJNY/mcL+SENLZ1L rtLSqHg+k2C7JdOPgb6kXsbEsKgQ6rFPHKnjCwtsKOc6MetVMwR0N/t34I8xChPHn837O8D/ /QzC42v5dVLwPU4v7YQq55qUHLTnwYPD/kKk98KmkQ87o25kgwPT60Fu/d89naV1RJlITsg/ g+WEuuCmPYwRAcLJ53t/YKL5Dflu/ELggFbDK1dOQLIe49XQj0Vi08FGyTJ5K0J9+sY6ELzs 2jzzxjWhyhjWvHyxIZUnVm9ONXeRbVKwCv6hls5OHaY6a1nMBzlawCq37TYl3Dz1w8QtSwCJ SqAp596x/sC6W6JT3vGTGi33564yQmBCABYLNyXJw0SQ/Q/F2x/0o5sU/4vAuDBuTzV4y3sR lbBBBmP71cO+zmQmatapMO8V8+lINEQc+WKlvcXb36vUShphDLtmsBHlmtcqsDxGtgXqtBQ3 BOYy/iNlJPFXU/JFEbgevWQg+bQ6RGFuaWVsIFZlaWxsYXJkIChSZWQgSGF0IHdvcmsgZW1h aWwpIDx2ZWlsbGFyZEByZWRoYXQuY29tPoheBBMRAgAeBQJDUpSLAhsDBgsJCAcDAgMVAgMD FgIBAh4BAheAAAoJEEYGuKXelbwfJcAAni8XquAlSF6z8WnJwQ6I7yrVTA6IAJ9NnwyV+dwE 1wkDg1eyogC6lcU8v4kCHAQQAQIABgUCU1n6kgAKCRBZXlskaUZz7ZnBD/9TIGS1KyGL0Bi1 WuP01JAMBzQ4Lgfi90Uwp6RZydZXAddAP3X1NBc8SqfcW8JZuB9BuStkcKvHnXK0+N9qJTrv Id01FVApfi85W02ZTN1eB3YnVKPIQqzlSPzhsBSf26JNX2zjq8hW8dmKBdBp1AG/oLVtrim+ Jbl5qi8EiqdznDwOyKYPbkN8OwC2q0q5C8V/dCltQENTlkJKUCHHXbP5v8r0TjIPveOa5MDY PmcoAnDC5D8OJlT6R0VLQzXpFEqET9o0CjDrynHH/8aOFGeIyesr0L+53VVgK/j2nq3XgduG dtnoWon8/C8sNHmGowoQDT8hdGWjv/qIl3bESRoAqIEGAwJloD1skJNDNpOdnf+m7mV8HBGk KUlQulXUCcVu608hKc34o+Jpmp2s1+qO12ta4AyahTJuew6KqTnHaO0xoyI9iPql07jZiane kb+TJtXt/a+iTrHJV9lgtw/qeg9kfMp/AfDLy8dbCVQVtADaPlyBM8DdY7gkpDiH81kRl9A6 CLjedHPSDIjdPH74rVfFf+VZ5ZvYXD2YlNuraYrcp62xfMY8vAjNHMUXk1OKQCwUcxJq39U+ j7wIAfakziVUuyZS2kK7wSfFFWHWELp2JpK4HswY1uhSHZsP29a0/ixT8ZmgE/ycmK58kG0D re2/KLGV/nQo4Ll9yUo+/rkBDQQ5NRH8EAQA6raUOSvHFNG42i2tV40BREp+exkXNnTXKS6m iTUtTNjvu5i0VDDHrkPyvaM8ILRng3jvRdDhhv/tVclHJZ7JylE//45a/1Xa5fl3Jk8vNDW5 gy1PEwjAFBQUg375MbgeIpwwER+9c6UtsAMxYv2o03OIDyq7cLpJQo3p2G0OIUcAAwUEAMGy b7gNE1ryao3pM9KgK+/iwsAglaAQm8Wd/AdsAROH6Wy1dwQ2QcecJ4m9ffE1MhCRQo//8VFG HFHS2C24MDsnOVIgEVnWbEIVMzp5vFfC+kIF7Rr9nq3Bgr4wHo6y+204GF1Uc3r3Cb2Fn7YW mk1NnVJ6teellDsxT+7MvfM/iEYEGBECAAYFAjk1EfwACgkQRga4pd6VvB86wwCePL+uqpMx hi0dph9gu0hcNMuDmEgAoIbkOwWEzQJVRTO305bzlIYAOvUiiE4EGBECAAYFAjk1EfwAEgkQ Rga4pd6VvB8HZUdQRwABATrDAJ48v66qkzGGLR2mH2C7SFw0y4OYSACghuQ7BYTNAlVFM7fT lvOUhgA69SI= =aP5f -----END PGP PUBLIC KEY BLOCK-----++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.8/daemon/libvirtd.conf +Index: libvirt-1.2.9/daemon/libvirtd.conf =================================================================== ---- libvirt-1.2.8.orig/daemon/libvirtd.conf -+++ libvirt-1.2.8/daemon/libvirtd.conf +--- libvirt-1.2.9.orig/daemon/libvirtd.conf ++++ libvirt-1.2.9/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -13,10 +13,10 @@ # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the libvirtd process for this to -Index: libvirt-1.2.8/daemon/libvirtd-config.c +Index: libvirt-1.2.9/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.2.8.orig/daemon/libvirtd-config.c -+++ libvirt-1.2.8/daemon/libvirtd-config.c +--- libvirt-1.2.9.orig/daemon/libvirtd-config.c ++++ libvirt-1.2.9/daemon/libvirtd-config.c @@ -229,7 +229,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -26,10 +26,10 @@ data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-1.2.8/daemon/test_libvirtd.aug.in +Index: libvirt-1.2.9/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-1.2.8.orig/daemon/test_libvirtd.aug.in -+++ libvirt-1.2.8/daemon/test_libvirtd.aug.in +--- libvirt-1.2.9.orig/daemon/test_libvirtd.aug.in ++++ libvirt-1.2.9/daemon/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: ++++++ libvirtd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-1.2.8/daemon/libvirtd.sysconf +Index: libvirt-1.2.9/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.2.8.orig/daemon/libvirtd.sysconf -+++ libvirt-1.2.8/daemon/libvirtd.sysconf +--- libvirt-1.2.9.orig/daemon/libvirtd.sysconf ++++ libvirt-1.2.9/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ ppc64le-canonical-name.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-1.2.8/src/util/virarch.c +Index: libvirt-1.2.9/src/util/virarch.c =================================================================== ---- libvirt-1.2.8.orig/src/util/virarch.c -+++ libvirt-1.2.8/src/util/virarch.c +--- libvirt-1.2.9.orig/src/util/virarch.c ++++ libvirt-1.2.9/src/util/virarch.c @@ -169,6 +169,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -8,10 +8,10 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-1.2.8/src/xenconfig/xen_common.c +Index: libvirt-1.2.9/src/xenconfig/xen_common.c =================================================================== ---- libvirt-1.2.8.orig/src/xenconfig/xen_common.c -+++ libvirt-1.2.8/src/xenconfig/xen_common.c +--- libvirt-1.2.9.orig/src/xenconfig/xen_common.c ++++ libvirt-1.2.9/src/xenconfig/xen_common.c @@ -401,6 +401,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -66,11 +66,11 @@ hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; hostdev->source.subsys.u.pci.addr.domain = domainID; hostdev->source.subsys.u.pci.addr.bus = busID; -Index: libvirt-1.2.8/src/xenconfig/xen_sxpr.c +Index: libvirt-1.2.9/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.2.8.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.2.8/src/xenconfig/xen_sxpr.c -@@ -997,6 +997,7 @@ xenParseSxprPCI(virDomainDefPtr def, +--- libvirt-1.2.9.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.2.9/src/xenconfig/xen_sxpr.c +@@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; int funcID; @@ -78,7 +78,7 @@ node = cur->u.s.car; if (!sexpr_lookup(node, "dev")) -@@ -1044,11 +1045,13 @@ xenParseSxprPCI(virDomainDefPtr def, +@@ -1046,11 +1047,13 @@ xenParseSxprPCI(virDomainDefPtr def, goto error; } @@ -93,7 +93,7 @@ dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; dev->source.subsys.u.pci.addr.domain = domainID; dev->source.subsys.u.pci.addr.bus = busID; -@@ -1990,11 +1993,15 @@ static void +@@ -1993,11 +1996,15 @@ static void xenFormatSxprPCI(virDomainHostdevDefPtr def, virBufferPtr buf) { @@ -110,7 +110,7 @@ } -@@ -2013,12 +2020,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP +@@ -2016,12 +2023,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP virBufferPtr buf, int detach) { @@ -123,7 +123,7 @@ virBufferAddLit(buf, "(pci "); xenFormatSxprPCI(def, buf); if (detach) -@@ -2073,12 +2074,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, +@@ -2076,12 +2077,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, for (i = 0; i < def->nhostdevs; i++) { if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.8/src/qemu/qemu.conf +Index: libvirt-1.2.9/src/qemu/qemu.conf =================================================================== ---- libvirt-1.2.8.orig/src/qemu/qemu.conf -+++ libvirt-1.2.8/src/qemu/qemu.conf +--- libvirt-1.2.9.orig/src/qemu/qemu.conf ++++ libvirt-1.2.9/src/qemu/qemu.conf @@ -200,7 +200,16 @@ # a special value; security_driver can be set to that value in # isolation, but it cannot appear in a list of drivers. @@ -19,7 +19,7 @@ # If set to non-zero, then the default security labeling # will make guests confined. If set to zero, then guests -@@ -409,11 +418,22 @@ +@@ -417,11 +426,22 @@ #allow_disk_format_probing = 1 ++++++ systemd-service-xen.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.8/daemon/libvirtd.service.in +Index: libvirt-1.2.9/daemon/libvirtd.service.in =================================================================== ---- libvirt-1.2.8.orig/daemon/libvirtd.service.in -+++ libvirt-1.2.8/daemon/libvirtd.service.in +--- libvirt-1.2.9.orig/daemon/libvirtd.service.in ++++ libvirt-1.2.9/daemon/libvirtd.service.in @@ -5,6 +5,8 @@ After=network.target After=dbus.service After=iscsid.service ++++++ virtlockd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-1.2.8/src/locking/virtlockd.sysconf +Index: libvirt-1.2.9/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.2.8.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.2.8/src/locking/virtlockd.sysconf +--- libvirt-1.2.9.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.2.9/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.2.8/src/locking/virtlockd.init.in +Index: libvirt-1.2.9/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.2.8.orig/src/locking/virtlockd.init.in -+++ libvirt-1.2.8/src/locking/virtlockd.init.in +--- libvirt-1.2.9.orig/src/locking/virtlockd.init.in ++++ libvirt-1.2.9/src/locking/virtlockd.init.in @@ -4,12 +4,14 @@ # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-ge… # ++++++ xen-name-for-devid.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -14,10 +14,10 @@ is inactive. We obviously can't search xenstore when the domain is inactive. -Index: libvirt-1.2.8/src/xen/xend_internal.c +Index: libvirt-1.2.9/src/xen/xend_internal.c =================================================================== ---- libvirt-1.2.8.orig/src/xen/xend_internal.c -+++ libvirt-1.2.8/src/xen/xend_internal.c +--- libvirt-1.2.9.orig/src/xen/xend_internal.c ++++ libvirt-1.2.9/src/xen/xend_internal.c @@ -72,7 +72,7 @@ VIR_LOG_INIT("xen.xend_internal"); #define XEND_RCV_BUF_MAX_LEN (256 * 1024) @@ -27,7 +27,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, int ref_len); -@@ -3328,37 +3328,35 @@ xenDaemonDomainBlockPeek(virConnectPtr c +@@ -3325,37 +3325,35 @@ xenDaemonDomainBlockPeek(virConnectPtr c * Returns 0 in case of success, -1 in case of failure. */ static int @@ -80,7 +80,7 @@ } else if (dev->type == VIR_DOMAIN_DEVICE_NET) { char mac[VIR_MAC_STRING_BUFLEN]; virDomainNetDefPtr netdef = dev->data.net; -@@ -3366,16 +3364,22 @@ virDomainXMLDevID(virConnectPtr conn, +@@ -3363,16 +3361,22 @@ virDomainXMLDevID(virConnectPtr conn, strcpy(class, "vif"); @@ -113,7 +113,7 @@ } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { -@@ -3391,17 +3395,44 @@ virDomainXMLDevID(virConnectPtr conn, +@@ -3388,17 +3392,44 @@ virDomainXMLDevID(virConnectPtr conn, strcpy(class, "pci"); ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.c4BjXm/_old 2014-10-05 20:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c4BjXm/_new 2014-10-05 20:33:25.000000000 +0200 @@ -1,8 +1,8 @@ -Index: libvirt-1.2.8/src/xenconfig/xen_sxpr.c +Index: libvirt-1.2.9/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.2.8.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.2.8/src/xenconfig/xen_sxpr.c -@@ -332,7 +332,7 @@ xenParseSxprChar(const char *value, +--- libvirt-1.2.9.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.2.9/src/xenconfig/xen_sxpr.c +@@ -334,7 +334,7 @@ xenParseSxprChar(const char *value, static int xenParseSxprDisks(virDomainDefPtr def, const struct sexpr *root, @@ -11,7 +11,7 @@ int xendConfigVersion) { const struct sexpr *cur, *node; -@@ -383,7 +383,6 @@ xenParseSxprDisks(virDomainDefPtr def, +@@ -385,7 +385,6 @@ xenParseSxprDisks(virDomainDefPtr def, /* There is a case without the uname to the CD-ROM device */ offset = strchr(dst, ':'); if (!offset || -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mate-utils for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package mate-utils for openSUSE:Factory checked in at 2014-10-05 20:31:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-utils (Old) and /work/SRC/openSUSE:Factory/.mate-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-utils/mate-utils.changes 2014-03-23 22:34:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mate-utils.new/mate-utils.changes 2014-10-05 20:33:17.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Oct 3 14:22:09 UTC 2014 - p.drouand(a)gmail.com + +- Update to version 1.8.1 + + Added keywords key to .desktop files + + Fixed several man pages + + Fixed gsearchtool format-security warning + +------------------------------------------------------------------- Old: ---- mate-utils-1.8.0.tar.xz New: ---- mate-utils-1.8.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-utils.spec ++++++ --- /var/tmp/diff_new_pack.EJpGSu/_old 2014-10-05 20:33:18.000000000 +0200 +++ /var/tmp/diff_new_pack.EJpGSu/_new 2014-10-05 20:33:18.000000000 +0200 @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ Name: mate-utils -Version: 1.8.0 +Version: 1.8.1 Release: 0 License: GPL-2.0+ and LGPL-2.0+ and GFDL-1.1 Summary: MATE Desktop utilities @@ -243,6 +243,7 @@ %{_datadir}/applications/mate-screenshot.desktop %{_datadir}/glib-2.0/schemas/org.mate.screenshot.gschema.xml %{_datadir}/mate-screenshot/ +%{_mandir}/man1/mate-panel-screenshot.1.gz %{_mandir}/man1/mate-screenshot.1* %files -n mate-search-tool ++++++ mate-utils-1.8.0.tar.xz -> mate-utils-1.8.1.tar.xz ++++++ ++++ 7306 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 python-caja for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package python-caja for openSUSE:Factory checked in at 2014-10-05 20:31:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-caja (Old) and /work/SRC/openSUSE:Factory/.python-caja.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-caja" Changes: -------- --- /work/SRC/openSUSE:Factory/python-caja/python-caja.changes 2014-03-22 18:02:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-caja.new/python-caja.changes 2014-10-05 20:33:16.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 3 14:23:18 UTC 2014 - p.drouand(a)gmail.com + +- Update to version 1.8.1 + + Now uses pkg-config for python detection and variables + +------------------------------------------------------------------- Old: ---- python-caja-1.8.0.tar.xz New: ---- python-caja-1.8.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-caja.spec ++++++ --- /var/tmp/diff_new_pack.dCIA17/_old 2014-10-05 20:33:17.000000000 +0200 +++ /var/tmp/diff_new_pack.dCIA17/_new 2014-10-05 20:33:17.000000000 +0200 @@ -16,7 +16,7 @@ # Name: python-caja -Version: 1.8.0 +Version: 1.8.1 Release: 0 Summary: Python bindings for Caja License: GPL-2.0 ++++++ python-caja-1.8.0.tar.xz -> python-caja-1.8.1.tar.xz ++++++ ++++ 1819 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/python-caja-1.8.0/ChangeLog new/python-caja-1.8.1/ChangeLog --- old/python-caja-1.8.0/ChangeLog 2014-03-01 15:35:48.000000000 +0100 +++ new/python-caja-1.8.1/ChangeLog 2014-09-28 22:05:15.000000000 +0200 @@ -1,5 +1,53 @@ # Generated by Makefile. Do not edit. +commit e6a60c2914bf73062d213638a4eedf90628d6f82 +Author: infirit <infirit(a)gmail.com> +Date: Sun Sep 28 22:04:27 2014 +0200 + + Bump version to 1.8.1 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4e1f13c8a12b20d341285d9d35bdb9fe30c0744e +Author: infirit <infirit(a)gmail.com> +Date: Sun Sep 28 22:04:09 2014 +0200 + + Update NEWS for 1.8.1 + + NEWS | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 4224857035116bc5e55368f9433ee3ed8b298c4c +Author: infirit <infirit(a)gmail.com> +Date: Thu Sep 25 15:26:18 2014 +0200 + + Bump Python required version to 2.7 + + We need this as this is the first release that uses pkgconfig. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a452f62621fc4607766ad48d372ef205aeb45576 +Author: infirit <infirit(a)gmail.com> +Date: Fri Jul 11 13:05:00 2014 +0200 + + Remove now unused python.m4 macro. + + m4/python.m4 | 136 ----------------------------------------------------------- + 1 file changed, 136 deletions(-) + +commit 6ed4ebcf1af8eaead423de1aefe2642f2d75a979 +Author: infirit <infirit(a)gmail.com> +Date: Fri Jul 11 12:43:27 2014 +0200 + + Use pkg-config for python detection and variables + + configure.ac | 8 ++++++-- + src/Makefile.am | 5 +++-- + 2 files changed, 9 insertions(+), 4 deletions(-) + commit b78ab50d774e22af4e422e8bc6d94f27f0447fce Author: Stefano Karapetsas <stefano(a)karapetsas.com> Date: Sat Mar 1 15:35:24 2014 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/python-caja-1.8.0/NEWS new/python-caja-1.8.1/NEWS --- old/python-caja-1.8.0/NEWS 2014-03-01 15:35:20.000000000 +0100 +++ new/python-caja-1.8.1/NEWS 2014-09-28 22:04:02.000000000 +0200 @@ -1,3 +1,7 @@ +1.8.1 Bugfix release + + * Use pkg-config for python detection and variables + 1.8.0 * Bugfixes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/python-caja-1.8.0/configure.ac new/python-caja-1.8.1/configure.ac --- old/python-caja-1.8.0/configure.ac 2014-03-01 15:35:17.000000000 +0100 +++ new/python-caja-1.8.1/configure.ac 2014-09-28 22:04:18.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([python-caja], [1.8.0], +AC_INIT([python-caja], [1.8.1], [https://github.com/mate-desktop/python-caja/issues], [python-caja], [http://mate-desktop.org]) @@ -30,8 +30,12 @@ dnl ************************************************** dnl * Check for Python dnl ************************************************** -AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR([could not find Python headers])]) -AM_CHECK_PYTHON_LIBS(,[AC_MSG_ERROR([could not find Python lib])]) +AM_PATH_PYTHON([2.7]) +PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}]) +PYTHON_LIB_LOC="`pkg-config python-${PYTHON_VERSION} --variable=libdir`" +AC_SUBST(PYTHON_LIBS) +AC_SUBST(PYTHON_CFLAGS) +AC_SUBST(PYTHON_LIB_LOC) if test "`pkg-config --variable=datadir pygobject-3.0`" != "" ; then PYGOBJECT_VERSION=pygobject-3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/python-caja-1.8.0/m4/libtool.m4 new/python-caja-1.8.1/m4/libtool.m4 --- old/python-caja-1.8.0/m4/libtool.m4 2014-03-01 15:35:33.000000000 +0100 +++ new/python-caja-1.8.1/m4/libtool.m4 2014-09-28 22:04:37.000000000 +0200 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1324,19 +1324,9 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac - ;; - powerpc64le-*) - LD="${LD-ld} -m elf32lppclinux" + LD="${LD-ld} -m elf_i386" ;; - powerpc64-*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1355,10 +1345,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1701,8 +1688,7 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2493,7 +2479,14 @@ *) objformat=elf ;; esac fi - version_type=freebsd-$objformat + # Handle Gentoo/FreeBSD as it was Linux + case $host_vendor in + gentoo) + version_type=linux ;; + *) + version_type=freebsd-$objformat ;; + esac + case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -2504,6 +2497,12 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; + linux) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_lib_prefix=no + need_version=no + ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -2526,6 +2525,17 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2642,7 +2652,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2687,18 +2697,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3258,6 +3256,10 @@ fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3296,11 +3298,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4048,7 +4050,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4112,7 +4114,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4347,7 +4349,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4589,9 +4591,6 @@ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4654,9 +4653,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4878,7 +4874,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5055,7 +5051,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5360,7 +5355,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6240,6 +6235,9 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; + gnu*) + ;; + haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6401,7 +6399,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/python-caja-1.8.0/m4/python.m4 new/python-caja-1.8.1/m4/python.m4 --- old/python-caja-1.8.0/m4/python.m4 2014-01-25 17:37:49.000000000 +0100 +++ new/python-caja-1.8.1/m4/python.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,136 +0,0 @@ -## this one is commonly used with AM_PATH_PYTHONDIR ... -dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) -dnl Check if a module containing a given symbol is visible to python. -AC_DEFUN([AM_CHECK_PYMOD], -[AC_REQUIRE([AM_PATH_PYTHON]) -py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` -AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) -AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ -ifelse([$2],[], [prog=" -import sys -try: - import $1 -except ImportError: - sys.exit(1) -except: - sys.exit(0) -sys.exit(0)"], [prog=" -import $1 -$1.$2"]) -if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC - then - eval "py_cv_mod_$py_mod_var=yes" - else - eval "py_cv_mod_$py_mod_var=no" - fi -]) -py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` -if test "x$py_val" != xno; then - AC_MSG_RESULT(yes) - ifelse([$3], [],, [$3 -])dnl -else - AC_MSG_RESULT(no) - ifelse([$4], [],, [$4 -])dnl -fi -]) - -dnl a macro to check for ability to create python extensions -dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) -dnl function also defines PYTHON_INCLUDES -AC_DEFUN([AM_CHECK_PYTHON_HEADERS], -[AC_REQUIRE([AM_PATH_PYTHON]) -AC_MSG_CHECKING(for headers required to compile python extensions) -dnl deduce PYTHON_INCLUDES -py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"` -py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"` -PYTHON_INCLUDES=`python-config --includes` -if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" -fi -AC_SUBST(PYTHON_INCLUDES) -dnl check if the headers exist: -save_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" -AC_TRY_CPP([#include <Python.h>],dnl -[AC_MSG_RESULT(found) -$1],dnl -[AC_MSG_RESULT(not found) -$2]) -CPPFLAGS="$save_CPPFLAGS" -]) - -# The AC_MULTILIB macro was extracted and modified from -# gettext-0.15's AC_LIB_PREPARE_MULTILIB macro in the lib-prefix.m4 file -# so that the correct paths can be used for 64-bit libraries. -# -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl From Bruno Haible. - -dnl AC_MULTILIB creates a variable libdirsuffix, containing -dnl the suffix of the libdir, either "" or "64". -dnl Only do this if the given enable parameter is "yes". -AC_DEFUN([AC_MULTILIB], -[ - dnl There is no formal standard regarding lib and lib64. The current - dnl practice is that on a system supporting 32-bit and 64-bit instruction - dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit - dnl libraries go under $prefix/lib. We determine the compiler's default - dnl mode by looking at the compiler's library search path. If at least - dnl of its elements ends in /lib64 or points to a directory whose absolute - dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the - dnl default, namely "lib". - enable_lib64="$1" - libdirsuffix="/i386-linux-gnu/" - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test "$enable_lib64" = "yes" -a -n "$searchpath"; then - save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) libdirsuffix=64 ;; - /lib/x86_64-linux-gnu/ | /lib/x86_64-linux-gnu ) libdirsuffix=/x86_64-linux-gnu ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) libdirsuffix=64 ;; - /lib/x86_64-linux-gnu ) libdirsuffix=/x86_64-linux-gnu ;; - esac ;; - esac - fi - done - IFS="$save_IFS" - fi - AC_SUBST(libdirsuffix) -]) - -dnl a macro to check for ability to embed python -dnl AM_CHECK_PYTHON_LIBS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) -dnl function also defines PYTHON_LIBS -AC_DEFUN([AM_CHECK_PYTHON_LIBS], -[AC_REQUIRE([AM_CHECK_PYTHON_HEADERS]) -AC_MSG_CHECKING(for libraries required to embed python) -dnl deduce PYTHON_LIBS -py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"` -AC_MULTILIB(yes) - -if test "x$PYTHON_LIBS" = x; then - PYTHON_LIBS="-L${py_prefix}/lib${libdirsuffix} -lpython${PYTHON_VERSION}" -fi - -if test "x$PYTHON_LIB_LOC" = x; then - PYTHON_LIB_LOC="${py_prefix}/lib${libdirsuffix}" -fi -AC_SUBST(PYTHON_LIBS) -AC_SUBST(PYTHON_LIB_LOC) -dnl check if the headers exist: -save_LIBS="$LIBS" -LIBS="$LIBS $PYTHON_LIBS" -AC_TRY_LINK_FUNC(Py_Initialize, dnl - [LIBS="$save_LIBS"; AC_MSG_RESULT(yes); $1], dnl - [LIBS="$save_LIBS"; AC_MSG_RESULT(no); $2]) - -]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/python-caja-1.8.0/src/Makefile.am new/python-caja-1.8.1/src/Makefile.am --- old/python-caja-1.8.0/src/Makefile.am 2014-01-25 17:37:49.000000000 +0100 +++ new/python-caja-1.8.1/src/Makefile.am 2014-07-11 13:07:02.000000000 +0200 @@ -16,12 +16,13 @@ -DLIBDIR=\"$(libdir)\" \ -DPYTHON_VERSION=\"$(PYTHON_VERSION)\" \ -DPY_LIB_LOC="\"$(PYTHON_LIB_LOC)\"" \ - $(PYTHON_INCLUDES) \ + $(CAJA_PYTHON_CFLAGS) \ $(AM_CPPFLAGS) libcaja_python_la_CFLAGS = \ + $(PYTHON_CFLAGS) $(CAJA_PYTHON_CFLAGS) \ $(AM_CFLAGS) libcaja_python_la_LDFLAGS = -module -avoid-version -libcaja_python_la_LIBADD = $(CAJA_PYTHON_LIBS) $(PYTHON_LIBS) +libcaja_python_la_LIBADD = $(PYTHON_LIBS) $(CAJA_PYTHON_LIBS) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mate-terminal for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package mate-terminal for openSUSE:Factory checked in at 2014-10-05 20:31:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-terminal (Old) and /work/SRC/openSUSE:Factory/.mate-terminal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-terminal" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-terminal/mate-terminal.changes 2014-03-22 18:01:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mate-terminal.new/mate-terminal.changes 2014-10-05 20:33:15.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Oct 3 14:17:04 UTC 2014 - p.drouand(a)gmail.com + +- Update to version 1.8.1 + + Fixed opening new terminal in a tab + + Added colon to PATHCHARS_CLASS for URL detection + +------------------------------------------------------------------- Old: ---- mate-terminal-1.8.0.tar.xz New: ---- mate-terminal-1.8.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-terminal.spec ++++++ --- /var/tmp/diff_new_pack.bQ8IZt/_old 2014-10-05 20:33:16.000000000 +0200 +++ /var/tmp/diff_new_pack.bQ8IZt/_new 2014-10-05 20:33:16.000000000 +0200 @@ -15,7 +15,7 @@ Name: mate-terminal -Version: 1.8.0 +Version: 1.8.1 Release: 0 License: GPL-3.0+ Summary: MATE Desktop system tools ++++++ mate-terminal-1.8.0.tar.xz -> mate-terminal-1.8.1.tar.xz ++++++ ++++ 1957 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/ChangeLog new/mate-terminal-1.8.1/ChangeLog --- old/mate-terminal-1.8.0/ChangeLog 2014-03-01 14:50:42.000000000 +0100 +++ new/mate-terminal-1.8.1/ChangeLog 2014-09-28 21:52:09.000000000 +0200 @@ -1,5 +1,48 @@ # Generated by Makefile. Do not edit. +commit da375f9474b5cae0e6b8724a3f5976050118e237 +Author: infirit <infirit(a)gmail.com> +Date: Sun Sep 28 21:50:54 2014 +0200 + + Bump version to 1.8.1 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cad2fcd7b988b25b0103d9023f3d8779336d35e1 +Author: infirit <infirit(a)gmail.com> +Date: Sun Sep 28 21:50:41 2014 +0200 + + Update NEWS for 1.8.1 + + NEWS | 5 +++++ + 1 file changed, 5 insertions(+) + +commit dd5636bc091e9abc3b916d86be95b8e8ef452876 +Author: Martin Wimpress <code(a)flexion.org> +Date: Mon Feb 24 14:44:24 2014 +0000 + + Opening new terminal in a tab now works. The new intended behaviour is desbribed + in https://bugzilla.gnome.org/show_bug.cgi?id=83203#c57 Fixes #45. + + src/terminal-app.c | 95 ++++++++++++++++++++++++++++++++++++++++---------- + src/terminal-app.h | 4 ++- + src/terminal-options.c | 12 +++++-- + src/terminal-options.h | 2 ++ + src/terminal-window.c | 45 ++++++++++++++++++++++++ + src/terminal-window.h | 3 ++ + src/terminal.c | 46 ++++++++++++++++++++---- + 7 files changed, 178 insertions(+), 29 deletions(-) + +commit 31fb0be28e7764fad7b7cb99d84fe8e015a8408c +Author: infirit <infirit(a)gmail.com> +Date: Mon Aug 18 18:30:48 2014 +0200 + + Add colon to PATHCHARS_CLASS for url detection. + + src/terminal-screen.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit f6d1706007760cf7c7ad509dc6f5321a0a9c0583 Author: Stefano Karapetsas <stefano(a)karapetsas.com> Date: Sat Mar 1 14:49:57 2014 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/NEWS new/mate-terminal-1.8.1/NEWS --- old/mate-terminal-1.8.0/NEWS 2014-03-01 14:49:51.000000000 +0100 +++ new/mate-terminal-1.8.1/NEWS 2014-09-28 21:50:34.000000000 +0200 @@ -1,3 +1,8 @@ +1.8.1 + + * Opening new terminal in a tab now works. + * Add colon to PATHCHARS_CLASS for url detection. + 1.8.0 * Add GTK3 support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/configure.ac new/mate-terminal-1.8.1/configure.ac --- old/mate-terminal-1.8.0/configure.ac 2014-03-01 14:49:48.000000000 +0100 +++ new/mate-terminal-1.8.1/configure.ac 2014-09-28 21:50:50.000000000 +0200 @@ -1,6 +1,6 @@ m4_define([gt_version_major],[1]) m4_define([gt_version_minor],[8]) -m4_define([gt_version_micro],[0]) +m4_define([gt_version_micro],[1]) m4_define([gt_version_extra],[]) m4_define([gt_version],[gt_version_major().gt_version_minor().gt_version_micro()gt_version_extra]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/m4/intltool.m4 new/mate-terminal-1.8.1/m4/intltool.m4 --- old/mate-terminal-1.8.0/m4/intltool.m4 2014-03-01 14:50:00.000000000 +0100 +++ new/mate-terminal-1.8.1/m4/intltool.m4 2014-09-28 21:50:58.000000000 +0200 @@ -155,31 +155,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile AC_SUBST(ALL_LINGUAS) -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - IT_PO_SUBDIR([po]) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/m4/libtool.m4 new/mate-terminal-1.8.1/m4/libtool.m4 --- old/mate-terminal-1.8.0/m4/libtool.m4 2014-03-01 14:50:04.000000000 +0100 +++ new/mate-terminal-1.8.1/m4/libtool.m4 2014-09-28 21:51:02.000000000 +0200 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1324,19 +1324,9 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac - ;; - powerpc64le-*) - LD="${LD-ld} -m elf32lppclinux" + LD="${LD-ld} -m elf_i386" ;; - powerpc64-*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1355,10 +1345,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1701,8 +1688,7 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2493,7 +2479,14 @@ *) objformat=elf ;; esac fi - version_type=freebsd-$objformat + # Handle Gentoo/FreeBSD as it was Linux + case $host_vendor in + gentoo) + version_type=linux ;; + *) + version_type=freebsd-$objformat ;; + esac + case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -2504,6 +2497,12 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; + linux) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_lib_prefix=no + need_version=no + ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -2526,6 +2525,17 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2642,7 +2652,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2687,18 +2697,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3258,6 +3256,10 @@ fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3296,11 +3298,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4048,7 +4050,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4112,7 +4114,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4347,7 +4349,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4589,9 +4591,6 @@ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4654,9 +4653,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4878,7 +4874,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5055,7 +5051,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5360,7 +5355,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6240,6 +6235,9 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; + gnu*) + ;; + haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6401,7 +6399,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/po/Makefile.in.in new/mate-terminal-1.8.1/po/Makefile.in.in --- old/mate-terminal-1.8.0/po/Makefile.in.in 2014-03-01 14:50:00.000000000 +0100 +++ new/mate-terminal-1.8.1/po/Makefile.in.in 2014-09-28 21:50:58.000000000 +0200 @@ -33,8 +33,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = @localedir@ subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -108,7 +107,7 @@ install-data-yes: all linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ if test -r $$lang.gmo; then \ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ @@ -142,8 +141,8 @@ uninstall: linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/src/terminal-app.c new/mate-terminal-1.8.1/src/terminal-app.c --- old/mate-terminal-1.8.0/src/terminal-app.c 2014-02-23 19:17:25.000000000 +0100 +++ new/mate-terminal-1.8.1/src/terminal-app.c 2014-09-28 21:49:38.000000000 +0200 @@ -219,6 +219,29 @@ return screen; } +static int +terminal_app_get_workspace_for_window (TerminalWindow *window) +{ + int ret = -1; + guchar *data = NULL; + GdkAtom atom; + GdkAtom cardinal_atom; + + atom = gdk_atom_intern_static_string ("_NET_WM_DESKTOP"); + cardinal_atom = gdk_atom_intern_static_string ("CARDINAL"); + + gdk_property_get (gtk_widget_get_window(GTK_WIDGET(window)), + atom, cardinal_atom, 0, 8, FALSE, + NULL, NULL, NULL, &data); + + if (data) + ret = *(int *)data; + + g_free (data); + return ret; +} + + /* Menubar mnemonics settings handling */ static int @@ -1688,32 +1711,38 @@ for (lw = options->initial_windows; lw != NULL; lw = lw->next) { InitialWindow *iw = lw->data; - TerminalWindow *window; + TerminalWindow *window = NULL; GList *lt; g_assert (iw->tabs); - /* Create & setup new window */ - window = terminal_app_new_window (app, gdk_screen); + if ( lw == options->initial_windows && ((InitialTab *)iw->tabs->data)->attach_window ) + window = terminal_app_get_current_window(app, gdk_screen, options->initial_workspace); - /* Restored windows shouldn't demand attention; see bug #586308. */ - if (iw->source_tag == SOURCE_SESSION) - terminal_window_set_is_restored (window); - - if (options->startup_id != NULL) - gtk_window_set_startup_id (GTK_WINDOW (window), options->startup_id); - - /* Overwrite the default, unique window role set in terminal_window_init */ - if (iw->role) - gtk_window_set_role (GTK_WINDOW (window), iw->role); - - if (iw->force_menubar_state) - terminal_window_set_menubar_visible (window, iw->menubar_state); - - if (iw->start_fullscreen) - gtk_window_fullscreen (GTK_WINDOW (window)); - if (iw->start_maximized) - gtk_window_maximize (GTK_WINDOW (window)); + if (!window) + { + /* Create & setup new window */ + window = terminal_app_new_window (app, gdk_screen); + + /* Restored windows shouldn't demand attention; see bug #586308. */ + if (iw->source_tag == SOURCE_SESSION) + terminal_window_set_is_restored (window); + + if (options->startup_id != NULL) + gtk_window_set_startup_id (GTK_WINDOW (window), options->startup_id); + + /* Overwrite the default, unique window role set in terminal_window_init */ + if (iw->role) + gtk_window_set_role (GTK_WINDOW (window), iw->role); + + if (iw->force_menubar_state) + terminal_window_set_menubar_visible (window, iw->menubar_state); + + if (iw->start_fullscreen) + gtk_window_fullscreen (GTK_WINDOW (window)); + if (iw->start_maximized) + gtk_window_maximize (GTK_WINDOW (window)); + } /* Now add the tabs */ for (lt = iw->tabs; lt != NULL; lt = lt->next) @@ -1842,13 +1871,41 @@ terminal_encoding_dialog_show (transient_parent); } +/* +* Get the window in the given screen and workspace. If nothing is found, +* a NULL is returned. +*/ TerminalWindow * -terminal_app_get_current_window (TerminalApp *app) +terminal_app_get_current_window (TerminalApp *app, + GdkScreen *from_screen, + int workspace) { + GList *res = NULL; + TerminalWindow *ret = NULL; + if (app->windows == NULL) return NULL; - return g_list_last (app->windows)->data; + res = g_list_last (app->windows); + + g_assert (from_screen != NULL); + + while (res) + { + int win_workspace; + if (gtk_window_get_screen(GTK_WINDOW(res->data)) != from_screen) + continue; + + win_workspace = terminal_app_get_workspace_for_window(res->data); + + /* Same workspace or if the window is set to show up on all workspaces */ + if (win_workspace == workspace || win_workspace == -1) + ret = terminal_window_get_latest_focused (ret, TERMINAL_WINDOW(res->data)); + + res = g_list_previous (res); + } + + return ret; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/src/terminal-app.h new/mate-terminal-1.8.1/src/terminal-app.h --- old/mate-terminal-1.8.0/src/terminal-app.h 2014-01-25 23:33:17.000000000 +0100 +++ new/mate-terminal-1.8.1/src/terminal-app.h 2014-09-28 21:49:38.000000000 +0200 @@ -115,7 +115,9 @@ char **child_env, double zoom); -TerminalWindow *terminal_app_get_current_window (TerminalApp *app); +TerminalWindow *terminal_app_get_current_window (TerminalApp *app, + GdkScreen *screen, + int curr_workspace); void terminal_app_manage_profiles (TerminalApp *app, GtkWindow *transient_parent); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/src/terminal-options.c new/mate-terminal-1.8.1/src/terminal-options.c --- old/mate-terminal-1.8.0/src/terminal-options.c 2014-02-23 19:17:25.000000000 +0100 +++ new/mate-terminal-1.8.1/src/terminal-options.c 2014-09-28 21:49:38.000000000 +0200 @@ -51,6 +51,7 @@ it->zoom = 1.0; it->zoom_set = FALSE; it->active = FALSE; + it->attach_window = FALSE; return it; } @@ -305,18 +306,22 @@ { TerminalOptions *options = data; gboolean is_profile_id; + InitialWindow *iw; + InitialTab *it; is_profile_id = g_str_has_suffix (option_name, "-with-profile-internal-id"); if (options->initial_windows) { - InitialWindow *iw; - iw = g_list_last (options->initial_windows)->data; iw->tabs = g_list_append (iw->tabs, initial_tab_new (value, is_profile_id)); } else - add_new_window (options, value, is_profile_id); + { + iw = add_new_window (options, value, is_profile_id); + it = g_list_last(iw->tabs)->data; + it->attach_window = TRUE; + } return TRUE; } @@ -707,6 +712,7 @@ options->default_maximize = FALSE; options->execute = FALSE; options->use_factory = TRUE; + options->initial_workspace = -1; options->env = g_strdupv (env); options->startup_id = g_strdup (startup_id && startup_id[0] ? startup_id : NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/src/terminal-options.h new/mate-terminal-1.8.1/src/terminal-options.h --- old/mate-terminal-1.8.0/src/terminal-options.h 2014-01-25 23:33:17.000000000 +0100 +++ new/mate-terminal-1.8.1/src/terminal-options.h 2014-09-28 21:49:38.000000000 +0200 @@ -53,6 +53,7 @@ char *config_file; gboolean load_config; gboolean save_config; + int initial_workspace; } TerminalOptions; typedef struct @@ -65,6 +66,7 @@ double zoom; guint zoom_set : 1; guint active : 1; + guint attach_window : 1; } InitialTab; typedef struct diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/src/terminal-screen.c new/mate-terminal-1.8.1/src/terminal-screen.c --- old/mate-terminal-1.8.0/src/terminal-screen.c 2014-02-23 19:17:25.000000000 +0100 +++ new/mate-terminal-1.8.1/src/terminal-screen.c 2014-09-25 14:48:26.000000000 +0200 @@ -157,7 +157,7 @@ #define HOSTCHARS_CLASS "[-[:alnum:]]" #define HOST HOSTCHARS_CLASS "+(\\." HOSTCHARS_CLASS "+)*" #define PORT "(?:\\:[[:digit:]]{1,5})?" -#define PATHCHARS_CLASS "[-[:alnum:]\\Q_$.+!*,;@&=?/~#%\\E]" +#define PATHCHARS_CLASS "[-[:alnum:]\\Q_$.+!*,:;@&=?/~#%\\E]" #define PATHTERM_CLASS "[^\\Q]'.}>) \t\r\n,\"\\E]" #define SCHEME "(?:news:|telnet:|nntp:|file:\\/|https?:|ftps?:|sftp:|webcal:)" #define USERPASS USERCHARS_CLASS "+(?:" PASSCHARS_CLASS "+)?" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/src/terminal-version.h new/mate-terminal-1.8.1/src/terminal-version.h --- old/mate-terminal-1.8.0/src/terminal-version.h 2014-03-01 14:50:12.000000000 +0100 +++ new/mate-terminal-1.8.1/src/terminal-version.h 2014-09-28 21:51:12.000000000 +0200 @@ -25,7 +25,7 @@ #define TERMINAL_MAJOR_VERSION (1) #define TERMINAL_MINOR_VERSION (8) -#define TERMINAL_MICRO_VERSION (0) +#define TERMINAL_MICRO_VERSION (1) #define TERMINAL_CHECK_VERSION(major,minor,micro) \ (TERMINAL_MAJOR_VERSION > (major) || \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/src/terminal-window.c new/mate-terminal-1.8.1/src/terminal-window.c --- old/mate-terminal-1.8.0/src/terminal-window.c 2014-02-23 19:17:25.000000000 +0100 +++ new/mate-terminal-1.8.1/src/terminal-window.c 2014-09-28 21:49:38.000000000 +0200 @@ -97,6 +97,7 @@ /* Workaround until gtk+ bug #535557 is fixed */ guint icon_title_set : 1; + time_t focus_time; }; #define PROFILE_DATA_KEY "GT::Profile" @@ -139,6 +140,9 @@ static gboolean terminal_window_delete_event (GtkWidget *widget, GdkEvent *event, gpointer data); +static gboolean terminal_window_focus_in_event (GtkWidget *widget, + GdkEventFocus *event, + gpointer data); static gboolean notebook_button_press_cb (GtkWidget *notebook, GdkEventButton *event, @@ -2136,6 +2140,10 @@ g_signal_connect (G_OBJECT (window), "delete_event", G_CALLBACK(terminal_window_delete_event), NULL); + g_signal_connect (G_OBJECT (window), "focus_in_event", + G_CALLBACK(terminal_window_focus_in_event), + NULL); + #ifdef MATE_ENABLE_DEBUG _TERMINAL_DEBUG_IF (TERMINAL_DEBUG_GEOMETRY) { @@ -2383,6 +2391,20 @@ return confirm_close_window_or_tab (TERMINAL_WINDOW (widget), NULL); } +static gboolean +terminal_window_focus_in_event (GtkWidget *widget, + GdkEventFocus *event, + gpointer data) +{ + TerminalWindow *window = TERMINAL_WINDOW (widget); + TerminalWindowPrivate *priv = window->priv; + + if (event->in) + priv->focus_time = time(NULL); + + return FALSE; +} + static void terminal_window_show (GtkWidget *widget) { @@ -4264,3 +4286,26 @@ g_key_file_set_string_list (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_TABS, (const char * const *) tab_names, len); g_strfreev (tab_names); } + + +TerminalWindow * +terminal_window_get_latest_focused (TerminalWindow *window1, + TerminalWindow *window2) +{ + TerminalWindowPrivate *priv1 = NULL; + TerminalWindowPrivate *priv2 = NULL; + + if (!window1) + return window2; + + if (!window2) + return window1; + + priv1 = window1->priv; + priv2 = window2->priv; + + if (priv2->focus_time > priv1->focus_time) + return window2; + + return window1; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/src/terminal-window.h new/mate-terminal-1.8.1/src/terminal-window.h --- old/mate-terminal-1.8.0/src/terminal-window.h 2014-01-25 23:33:17.000000000 +0100 +++ new/mate-terminal-1.8.1/src/terminal-window.h 2014-09-28 21:49:38.000000000 +0200 @@ -101,6 +101,9 @@ GKeyFile *key_file, const char *group); +TerminalWindow *terminal_window_get_latest_focused (TerminalWindow *window1, + TerminalWindow *window2); + G_END_DECLS #endif /* TERMINAL_WINDOW_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-terminal-1.8.0/src/terminal.c new/mate-terminal-1.8.1/src/terminal.c --- old/mate-terminal-1.8.0/src/terminal.c 2014-02-23 19:17:25.000000000 +0100 +++ new/mate-terminal-1.8.1/src/terminal.c 2014-09-28 21:49:38.000000000 +0200 @@ -155,12 +155,13 @@ TerminalOptions *options = NULL; GVariant *v_wd, *v_display, *v_sid, *v_envv, *v_argv; char *working_directory = NULL, *display_name = NULL, *startup_id = NULL; + int initial_workspace = -1; char **envv = NULL, **argv = NULL; int argc; GError *error = NULL; - g_variant_get (parameters, "(@ay@ay@ay@ay@ay)", - &v_wd, &v_display, &v_sid, &v_envv, &v_argv); + g_variant_get (parameters, "(@ay@ay@ay@ayi@ay)", + &v_wd, &v_display, &v_sid, &v_envv, &initial_workspace, &v_argv); working_directory = ay_to_string (v_wd, &error); if (error) @@ -175,10 +176,12 @@ argv = ay_to_strv (v_argv, &argc); _terminal_debug_print (TERMINAL_DEBUG_FACTORY, - "Factory invoked with working-dir='%s' display='%s' startup-id='%s'\n", + "Factory invoked with working-dir='%s' display='%s' startup-id='%s'" + "workspace='%d'\n", working_directory ? working_directory : "(null)", display_name ? display_name : "(null)", - startup_id ? startup_id : "(null)"); + startup_id ? startup_id : "(null)", + initial_workspace); options = terminal_options_parse (working_directory, display_name, @@ -190,6 +193,8 @@ &error, NULL); + options->initial_workspace = initial_workspace; + if (options != NULL) { terminal_app_handle_options (terminal_app_get (), options, FALSE /* no resume */, &error); @@ -233,6 +238,7 @@ "<arg type='ay' name='display_name' direction='in' />" "<arg type='ay' name='startup_id' direction='in' />" "<arg type='ay' name='environment' direction='in' />" + "<arg type='i' name='workspace' direction='in' />" "<arg type='ay' name='arguments' direction='in' />" "</method>" "</interface>" @@ -340,8 +346,8 @@ _terminal_debug_print (TERMINAL_DEBUG_FACTORY, "Forwarding arguments to existing instance\n"); - g_variant_builder_init (&builder, G_VARIANT_TYPE ("(ayayayayay)")); - + g_variant_builder_init (&builder, G_VARIANT_TYPE ("(ayayayayiay)")); + g_variant_builder_add (&builder, "@ay", string_to_ay (data->options->default_working_dir)); g_variant_builder_add (&builder, "@ay", string_to_ay (data->options->display_name)); g_variant_builder_add (&builder, "@ay", string_to_ay (data->options->startup_id)); @@ -368,6 +374,8 @@ g_variant_builder_add (&builder, "@ay", g_variant_new_from_data (G_VARIANT_TYPE ("ay"), s, len, TRUE, g_free, s)); + g_variant_builder_add (&builder, "@i", g_variant_new_int32 (data->options->initial_workspace)); + string = g_string_new (NULL); for (i = 0; i < data->argc; ++i) @@ -510,6 +518,29 @@ return g_string_free (name, FALSE); } +static int +get_initial_workspace (void) +{ + int ret = -1; + GdkWindow *window; + guchar *data = NULL; + GdkAtom atom; + GdkAtom cardinal_atom; + + g_type_init (); + + window = gdk_get_default_root_window(); + + atom = gdk_atom_intern_static_string ("_NET_CURRENT_DESKTOP"); + cardinal_atom = gdk_atom_intern_static_string ("CARDINAL"); + + gdk_property_get (window, atom, cardinal_atom, 0, 8, FALSE, NULL, NULL, NULL, &data); + + ret = *(int *)data; + g_free (data); + return ret; +} + int main (int argc, char **argv) { @@ -610,6 +641,9 @@ data->argv = argv_copy; data->argc = argc_copy; + gtk_init(&argc, &argv); + options->initial_workspace = get_initial_workspace (); + owner_id = g_bus_own_name (G_BUS_TYPE_SESSION, data->factory_name, G_BUS_NAME_OWNER_FLAGS_NONE, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mate-settings-daemon for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package mate-settings-daemon for openSUSE:Factory checked in at 2014-10-05 20:31:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-settings-daemon (Old) and /work/SRC/openSUSE:Factory/.mate-settings-daemon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-settings-daemon" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-settings-daemon/mate-settings-daemon.changes 2014-07-21 22:34:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mate-settings-daemon.new/mate-settings-daemon.changes 2014-10-05 20:33:13.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Oct 3 14:15:36 UTC 2014 - p.drouand(a)gmail.com + +- Update to version 1.8.2 + + mpris: Replace googlemusicframe with nuvolaplayer + + Update schema to use toggle shell script + +------------------------------------------------------------------- Old: ---- mate-settings-daemon-1.8.1.tar.xz New: ---- mate-settings-daemon-1.8.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-settings-daemon.spec ++++++ --- /var/tmp/diff_new_pack.kay6kX/_old 2014-10-05 20:33:14.000000000 +0200 +++ /var/tmp/diff_new_pack.kay6kX/_new 2014-10-05 20:33:14.000000000 +0200 @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ Name: mate-settings-daemon -Version: 1.8.1 +Version: 1.8.2 Release: 0 License: GPL-2.0 and LGPL-2.1 Summary: MATE session settings daemon ++++++ mate-settings-daemon-1.8.1.tar.xz -> mate-settings-daemon-1.8.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-settings-daemon-1.8.1/ChangeLog new/mate-settings-daemon-1.8.2/ChangeLog --- old/mate-settings-daemon-1.8.1/ChangeLog 2014-05-06 20:48:07.000000000 +0200 +++ new/mate-settings-daemon-1.8.2/ChangeLog 2014-09-28 21:46:44.000000000 +0200 @@ -1,6 +1,42 @@ +commit 2d78fb01819008db7435c908f1f95988574c34fb +Author: infirit <infirit(a)gmail.com> +Date: 2014-09-28 + + Bump version to 1.8.2 + +M configure.ac + +commit f50e2e9bc5e1cbedae719b5f14a74d77fb3b25b2 +Author: infirit <infirit(a)gmail.com> +Date: 2014-09-28 + + Update NEWS for 1.8.2 + +M NEWS + +commit 48aa831dbfbbd26e7d3c4504db133d87cb979516 +Author: infirit <infirit(a)gmail.com> +Date: 2013-09-21 + + Update schema to use toggle shell script + + Fixes https://github.com/mate-desktop/mate-settings-daemon/issues/32 + +M data/org.mate.keybindings.gschema.xml.in.in + +commit 16a8631b453269a774c03d422eb91cc112d43d1f +Author: Daniel Kao <daniel.m.kao(a)gmail.com> +Date: 2014-07-08 + + mpris: Replace googlemusicframe with nuvolaplayer + + googlemusicframe was renamed to nuvolaplayer in late 2011. + +M plugins/mpris/msd-mpris-manager.c + commit 81d5a3618596323c6dd84dd782bfc5d5fbd448bd Author: Stefano Karapetsas <stefano(a)karapetsas.com> -Date: 2014-05-06 +Date: 2014-05-06 Bump version to 1.8.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-settings-daemon-1.8.1/NEWS new/mate-settings-daemon-1.8.2/NEWS --- old/mate-settings-daemon-1.8.1/NEWS 2014-05-06 20:46:41.000000000 +0200 +++ new/mate-settings-daemon-1.8.2/NEWS 2014-09-28 21:43:19.000000000 +0200 @@ -1,3 +1,7 @@ +1.8.2 + * mpris: Replace googlemusicframe with nuvolaplayer + * Update schema to use toggle shell script + 1.8.1 * Added support for Gtk/DecorationLayout for GTK3 CSD windows diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-settings-daemon-1.8.1/aclocal.m4 new/mate-settings-daemon-1.8.2/aclocal.m4 --- old/mate-settings-daemon-1.8.1/aclocal.m4 2014-05-06 20:47:15.000000000 +0200 +++ new/mate-settings-daemon-1.8.2/aclocal.m4 2014-09-28 21:43:51.000000000 +0200 @@ -495,7 +495,7 @@ gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) %.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ all-am: $(gsettings_SCHEMAS:.xml=.valid) uninstall-am: uninstall-gsettings-schemas @@ -541,7 +541,7 @@ ) # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-settings-daemon-1.8.1/config.guess new/mate-settings-daemon-1.8.2/config.guess --- old/mate-settings-daemon-1.8.1/config.guess 2014-05-06 20:47:17.000000000 +0200 +++ new/mate-settings-daemon-1.8.2/config.guess 2014-09-28 21:43:54.000000000 +0200 @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2014-02-12' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -826,7 +826,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-settings-daemon-1.8.1/config.sub new/mate-settings-daemon-1.8.2/config.sub --- old/mate-settings-daemon-1.8.1/config.sub 2014-05-06 20:47:17.000000000 +0200 +++ new/mate-settings-daemon-1.8.2/config.sub 2014-09-28 21:43:54.000000000 +0200 @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2014-01-01' +timestamp='2014-07-28' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -283,8 +283,10 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -296,8 +298,7 @@ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -402,8 +403,10 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -415,6 +418,7 @@ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -842,6 +846,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1387,14 +1395,14 @@ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1612,9 +1620,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-settings-daemon-1.8.1/configure new/mate-settings-daemon-1.8.2/configure --- old/mate-settings-daemon-1.8.1/configure 2014-05-06 20:47:16.000000000 +0200 +++ new/mate-settings-daemon-1.8.2/configure 2014-09-28 21:43:52.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for mate-settings-daemon 1.8.1. +# Generated by GNU Autoconf 2.69 for mate-settings-daemon 1.8.2. # # Report bugs to <http://www.mate-desktop.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='mate-settings-daemon' PACKAGE_TARNAME='mate-settings-daemon' -PACKAGE_VERSION='1.8.1' -PACKAGE_STRING='mate-settings-daemon 1.8.1' +PACKAGE_VERSION='1.8.2' +PACKAGE_STRING='mate-settings-daemon 1.8.2' PACKAGE_BUGREPORT='http://www.mate-desktop.org/' PACKAGE_URL='' @@ -1475,7 +1475,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 mate-settings-daemon 1.8.1 to adapt to many kinds of systems. +\`configure' configures mate-settings-daemon 1.8.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1550,7 +1550,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mate-settings-daemon 1.8.1:";; + short | recursive ) echo "Configuration of mate-settings-daemon 1.8.2:";; esac cat <<\_ACEOF @@ -1727,7 +1727,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mate-settings-daemon configure 1.8.1 +mate-settings-daemon configure 1.8.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2271,7 +2271,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mate-settings-daemon $as_me 1.8.1, which was +It was created by mate-settings-daemon $as_me 1.8.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3138,7 +3138,7 @@ # Define the identity of the package. PACKAGE='mate-settings-daemon' - VERSION='1.8.1' + VERSION='1.8.2' cat >>confdefs.h <<_ACEOF @@ -18065,7 +18065,7 @@ gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) %.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@ + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p $(@D) && touch $@ all-am: $(gsettings_SCHEMAS:.xml=.valid) uninstall-am: uninstall-gsettings-schemas @@ -20640,7 +20640,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mate-settings-daemon $as_me 1.8.1, which was +This file was extended by mate-settings-daemon $as_me 1.8.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20706,7 +20706,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mate-settings-daemon config.status 1.8.1 +mate-settings-daemon config.status 1.8.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-settings-daemon-1.8.1/configure.ac new/mate-settings-daemon-1.8.2/configure.ac --- old/mate-settings-daemon-1.8.1/configure.ac 2014-05-06 20:46:41.000000000 +0200 +++ new/mate-settings-daemon-1.8.2/configure.ac 2014-09-28 21:43:33.000000000 +0200 @@ -2,7 +2,7 @@ m4_define([msd_api_version_major],[1]) m4_define([msd_api_version_minor],[8]) -m4_define([msd_api_version_micro],[1]) +m4_define([msd_api_version_micro],[2]) m4_define([msd_api_version], [msd_api_version_major.msd_api_version_minor.msd_api_version_micro]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-settings-daemon-1.8.1/data/org.mate.keybindings.gschema.xml.in.in new/mate-settings-daemon-1.8.2/data/org.mate.keybindings.gschema.xml.in.in --- old/mate-settings-daemon-1.8.1/data/org.mate.keybindings.gschema.xml.in.in 2014-01-06 21:18:58.000000000 +0100 +++ new/mate-settings-daemon-1.8.2/data/org.mate.keybindings.gschema.xml.in.in 2014-09-19 18:24:37.000000000 +0200 @@ -16,7 +16,7 @@ <_description>This is the name of the keyboard shortcut to toggle the magnifier. This name will be shown in the keyboard shortcut preferences dialog.</_description> </key> <key name="action" type="s"> - <default>'mateconftool-2 --toggle /desktop/mate/applications/at/screen_magnifier_enabled'</default> + <default>'mate-gsettings-toggle screen-keyboard-enabled'</default> <_summary>Toggle magnifier</_summary> <_description>Command used to turn the magnifier on or off.</_description> </key> @@ -33,7 +33,7 @@ <_description>This is the name of the keyboard shortcut to toggle the screen reader. This name will be shown in the keyboard shortcut preferences dialog.</_description> </key> <key name="action" type="s"> - <default>'mateconftool-2 --toggle /desktop/mate/applications/at/screen_reader_enabled'</default> + <default>'mate-gsettings-toggle screen-reader-enabled'</default> <_summary>Toggle screen reader</_summary> <_description>Command used to turn the screen reader on or off.</_description> </key> @@ -50,7 +50,7 @@ <_description>Binding to toggle the on-screen keyboard.</_description> </key> <key name="action" type="s"> - <default>'mateconftool-2 --toggle /desktop/mate/applications/at/screen_keyboard_enabled'</default> + <default>'mate-gsettings-toggle screen-keyboard-enabled'</default> <_summary>Toggle on-screen keyboard</_summary> <_description>Command used to turn the on-screen keyboard on or off.</_description> </key> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-settings-daemon-1.8.1/plugins/mpris/msd-mpris-manager.c new/mate-settings-daemon-1.8.2/plugins/mpris/msd-mpris-manager.c --- old/mate-settings-daemon-1.8.1/plugins/mpris/msd-mpris-manager.c 2013-08-01 12:55:46.000000000 +0200 +++ new/mate-settings-daemon-1.8.2/plugins/mpris/msd-mpris-manager.c 2014-07-12 12:31:41.000000000 +0200 @@ -65,7 +65,7 @@ "org.mpris.MediaPlayer2.quodlibet", "org.mpris.MediaPlayer2.guayadeque", "org.mpris.MediaPlayer2.amarok", - "org.mpris.MediaPlayer2.googlemusicframe", + "org.mpris.MediaPlayer2.nuvolaplayer", "org.mpris.MediaPlayer2.xbmc", "org.mpris.MediaPlayer2.xnoise", "org.mpris.MediaPlayer2.gmusicbrowser", -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit booth for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2014-10-05 20:31:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "booth" Changes: -------- --- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-08-25 11:04:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-10-05 20:33:12.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Oct 3 14:07:24 UTC 2014 - dmuhamedagic(a)suse.com + +- doc: clarify the meaning of renewal-freq +- ra: add restart and reload actions (bnc#899244) +- upstream version: v0.2.0 + +------------------------------------------------------------------- +Fri Sep 12 14:42:30 UTC 2014 - dmuhamedagic(a)suse.com + +- doc: add documentation for upgrade from v0.1 +- build: stop arbitrator on update from previous v0.1 +- ra: support the previously released v0.1 +- build: better support for sysv and systemd init files +- ra: update library location +- upstream version: 644df54 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ booth.spec ++++++ --- /var/tmp/diff_new_pack.GQJqPd/_old 2014-10-05 20:33:13.000000000 +0200 +++ /var/tmp/diff_new_pack.GQJqPd/_new 2014-10-05 20:33:13.000000000 +0200 @@ -103,9 +103,15 @@ gzip < docs/boothd.8 > %{buildroot}/%{_mandir}/man8/booth.8.gz ln %{buildroot}/%{_mandir}/man8/booth.8.gz %{buildroot}/%{_mandir}/man8/boothd.8.gz +%if %{defined _unitdir} # systemd -mkdir -p %{buildroot}/usr/lib/systemd/system/ -cp -a conf/booth@.service %{buildroot}/usr/lib/systemd/system/booth@.service +mkdir -p %{buildroot}/%{_unitdir} +cp -a conf/booth@.service %{buildroot}/%{_unitdir}/booth@.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbooth-arbitrator +%else +# sysV init +ln -s ../../%{_initddir}/booth-arbitrator %{buildroot}%{_sbindir}/rcbooth-arbitrator +%endif #install test-parts @@ -143,16 +149,36 @@ %dir /usr/lib/ocf/resource.d %dir /usr/lib/ocf/resource.d/pacemaker %dir %{_sysconfdir}/booth -%exclude %{_initddir}/booth-arbitrator +%{_sbindir}/rcbooth-arbitrator /usr/lib/ocf/resource.d/pacemaker/booth-site %config %{_sysconfdir}/booth/booth.conf.example -/usr/lib/systemd/system/booth@.service +%if %{defined _unitdir} +%{_unitdir}/booth@.service +%exclude %{_initddir}/booth-arbitrator +%else +%{_initddir}/booth-arbitrator +%endif %dir %{_datadir}/booth %{_datadir}/booth/service-runnable %doc README COPYING +%doc README.upgrade-from-v0.1 + +# this should be preun, but... +%pre +# stop the arbitrator if it's the previous paxos version 1.0 +if [ "`booth version | awk '{print $2}'`" = "1.0" ]; then + echo "booth v0.1 found" + if grep -qs 'ticket.*;' /etc/booth/booth.conf; then + echo "Convert the booth configuration in /etc/booth/booth.conf!" + fi + if ps -o pid,cmd -e | grep -qs "[b]oothd arbitrator"; then + rcbooth-arbitrator stop + fi +fi +exit 0 %package test Summary: Test scripts for Booth ++++++ booth.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/.git_info new/booth/.git_info --- old/booth/.git_info 2014-08-21 16:30:28.000000000 +0200 +++ new/booth/.git_info 2014-10-02 10:04:28.000000000 +0200 @@ -1 +1 @@ -v0.1.7-321-g063bc2c +v0.2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/Makefile.am new/booth/Makefile.am --- old/booth/Makefile.am 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/Makefile.am 2014-10-02 09:19:51.000000000 +0200 @@ -43,7 +43,7 @@ config.guess config.sub missing install-sh \ autoheader automake autoconf test_lense.sh -dist_doc_DATA = README COPYING +dist_doc_DATA = README COPYING README.upgrade-from-v0.1 notrans_dist_man8_MANS = docs/boothd.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/README.upgrade-from-v0.1 new/booth/README.upgrade-from-v0.1 --- old/booth/README.upgrade-from-v0.1 1970-01-01 01:00:00.000000000 +0100 +++ new/booth/README.upgrade-from-v0.1 2014-10-02 09:19:51.000000000 +0200 @@ -0,0 +1,57 @@ +Notes on upgrade from PAXOS booth v0.1 +====================== + +Booth v0.1 was a booth version based on the PAXOS algorithm. The +current booth v0.2 is loosely based on raft and incompatible +with the one running v0.1. Therefore, rolling upgrades are not +possible. + +Due to the new multi-tenancy feature, the new arbitrator init +script cannot stop or test status of the paxos v0.1 arbitrator. +On upgrade to v0.2, the arbitrator, if running, will be stopped. + +The OCF resource-agent ocf:pacemaker:booth-site is capable of +stopping and monitoring the booth v0.1 site daemon. + +Update procedure +---------------- + +The recommended procedure for update from the paxos booth to the +new booth version is as follows: + +- convert the configuration file /etc/booth/booth.conf on all + nodes and arbitrators to the new syntax + +- update booth on all arbitrators and start them + +- update booth on all nodes and restart the resource: + + # crm resource restart booth + +Configuration file syntax changes +---------------- + +.Note +If you didn't specify expiry time or weights different from the +defaults, then you can skip this section and use the old +'booth.conf'. + +The new booth configuration has many more options for tickets +and the syntax for 'ticket' got changed. Whereas previously the +optional expiry time and weights could be specified by appending +them to the ticket name with a ';' as a separator, the new syntax +has separate tokens for all ticket options. + +For instance, this ticket specification: + + ticket="tkt-A;600;1,2,2" + +looks in the new syntax like this: + + ticket="tkt-A" + expire="600" + weights="1,2,2" + +See the 'booth(8)' man page for more details. + +# vim: set ft=asciidoc : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/booth.spec new/booth/booth.spec --- old/booth/booth.spec 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/booth.spec 2014-10-02 09:19:51.000000000 +0200 @@ -79,9 +79,15 @@ gzip < docs/boothd.8 > %{buildroot}/%{_mandir}/man8/booth.8.gz ln %{buildroot}/%{_mandir}/man8/booth.8.gz %{buildroot}/%{_mandir}/man8/boothd.8.gz +%if %{defined _unitdir} # systemd -mkdir -p %{buildroot}/usr/lib/systemd/system/ -cp -a conf/booth@.service %{buildroot}/usr/lib/systemd/system/booth@.service +mkdir -p %{buildroot}/%{_unitdir} +cp -a conf/booth@.service %{buildroot}/%{_unitdir}/booth@.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbooth-arbitrator +%else +# sysV init +ln -s ../../%{_initddir}/booth-arbitrator %{buildroot}%{_sbindir}/rcbooth-arbitrator +%endif #install test-parts @@ -101,22 +107,42 @@ %defattr(-,root,root,-) %{_sbindir}/booth %{_sbindir}/boothd -%{_initrddir}/booth-arbitrator %{_mandir}/man8/booth.8.gz %{_mandir}/man8/boothd.8.gz %dir /usr/lib/ocf %dir /usr/lib/ocf/resource.d %dir /usr/lib/ocf/resource.d/pacemaker %dir %{_sysconfdir}/booth +%{_sbindir}/rcbooth-arbitrator /usr/lib/ocf/resource.d/pacemaker/booth-site %config %{_sysconfdir}/booth/booth.conf.example -/usr/lib/systemd/system/booth@.service +%if %{defined _unitdir} +%{_unitdir}/booth@.service +%exclude %{_initddir}/booth-arbitrator +%else +%{_initddir}/booth-arbitrator +%endif %dir %{_datadir}/booth %{_datadir}/booth/service-runnable %doc README COPYING +%doc README.upgrade-from-v0.1 + +# this should be preun, but... +%pre +# stop the arbitrator if it's the previous paxos version 1.0 +if [ "`booth version | awk '{print $2}'`" = "1.0" ]; then + echo "booth v0.1 found" + if grep -qs 'ticket.*;' /etc/booth/booth.conf; then + echo "Convert the booth configuration in /etc/booth/booth.conf!" + fi + if ps -o pid,cmd -e | grep -qs "[b]oothd arbitrator"; then + rcbooth-arbitrator stop + fi +fi +exit 0 %package test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/docs/boothd.8.txt new/booth/docs/boothd.8.txt --- old/booth/docs/boothd.8.txt 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/docs/boothd.8.txt 2014-10-02 09:19:51.000000000 +0200 @@ -221,8 +221,10 @@ If the network reliability is often reduced over prolonged periods, it is advisable to try to renew more often. + -Before every renewal the 'before-acquire-handler' is run. This -parameter then doubles as a local cluster monitor interval. +Before every renewal, if defined, the command specified in +'before-acquire-handler' is run. In that case the 'renewal-freq' +parameter is effectively also the local cluster monitoring +interval. *'timeout'*:: After that time 'booth' will re-send packets if there was an diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/script/ocf/booth-site new/booth/script/ocf/booth-site --- old/booth/script/ocf/booth-site 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/script/ocf/booth-site 2014-10-02 09:19:51.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/bash -# vim: set sw=4 et : +# vim: set sw=4 : # # Resource Agent for BOOTH site daemon. # @@ -29,7 +29,8 @@ DEFAULT_BIN="boothd" DEFAULT_CONF="/etc/booth/booth.conf" -. ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs +: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat} +. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs ####################################################################### @@ -79,6 +80,8 @@ <actions> <action name="start" timeout="20" /> <action name="stop" timeout="20" /> +<action name="restart" timeout="20" /> +<action name="reload" timeout="20" /> <action name="monitor" timeout="20" interval="10" depth="0" start-delay="0" /> <action name="meta-data" timeout="5" /> <action name="validate-all" timeout="30" /> @@ -91,18 +94,25 @@ booth_site_usage() { cat <<END -usage: $0 {start|stop|monitor|validate-all|meta-data} +usage: $0 {start|stop|restart|reload|monitor|validate-all|meta-data} Expects to have a fully populated OCF RA-compliant environment set. END } - -get_booth_pid() { - ps -o pid,cmd -e | - grep -w "[b]oothd.*$OCF_RESKEY_config" | +grep_cmd_pid() { + ps -o pid,cmd -e | grep -w "$@" | awk '{print $1}' } +get_booth_pid() { + local pid + pid=`grep_cmd_pid "[b]oothd.*$OCF_RESKEY_config"` + if [ -z "$pid" ]; then + grep_cmd_pid "[b]oothd site$" + else + echo $pid + fi +} is_booth_running() { [ -n "`get_booth_pid`" ] } @@ -110,7 +120,9 @@ booth_site_status() { is_booth_running || return $OCF_NOT_RUNNING +} +booth_monitor_basic() { booth list -c $OCF_RESKEY_config > /dev/null } @@ -126,12 +138,11 @@ return $OCF_SUCCESS ;; $OCF_NOT_RUNNING) ;; - *) booth_site_stop ;; esac $OCF_RESKEY_daemon daemon -c $OCF_RESKEY_config $OCF_RESKEY_args sleep 1 - while ! booth_site_status; do + while ! booth_monitor_basic; do sleep 1 done @@ -153,12 +164,20 @@ return $OCF_SUCCESS } +booth_site_restart() { + booth_site_stop + booth_site_start +} + +booth_site_reload() { + booth_site_restart +} + booth_site_monitor() { booth_site_status case $? in 0) return $OCF_SUCCESS ;; $OCF_NOT_RUNNING) return $OCF_NOT_RUNNING ;; - *) return $OCF_ERR_GENERIC ;; esac } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/script/wireshark-dissector.lua new/booth/script/wireshark-dissector.lua --- old/booth/script/wireshark-dissector.lua 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/script/wireshark-dissector.lua 2014-10-02 09:19:51.000000000 +0200 @@ -2,6 +2,7 @@ -- do booth_proto = Proto("Booth","Booth") + local hdr_len = 48 function T32(tree, buffer, start, format) local b = buffer(start, 4) @@ -12,13 +13,23 @@ local endbuf = buffer:len() pinfo.cols.protocol = "Booth" - if (endbuf < 24) then + if (endbuf < hdr_len) then pinfo.cols.info = "Booth - too small" else - local hdr = tree:add(booth_proto, buffer(0, 24), "Booth header") + local hdr = tree:add(booth_proto, buffer(0, hdr_len), "Booth header") local cmd = buffer(28, 4) - local tcmd = T32(hdr, cmd, 0, "Cmd %08x, \"" .. cmd:string() .. "\""); + local tcmd = T32(hdr, cmd, 0, "Cmd \"" .. cmd:string() .. "\""); + + local req = buffer(32, 4) + if (req:uint() > 0) then + local treq = T32(hdr, req, 0, "Req \"" .. req:string() .. "\""); + end + + local reason = buffer(40, 4) + if (reason:uint() > 0) then + local treason = T32(hdr, reason, 0, "Reason \"" .. reason:string() .. "\""); + end local from = buffer(20, 4) local tfrom = T32(hdr, from, 0, "From %08x"); @@ -32,7 +43,7 @@ tlen:add_expert_info(PI_PROTOCOL, PI_WARN, "Length too big?") end - T32(hdr, buffer, 32, "Result %08x"); + T32(hdr, buffer, 44, "Result %08x"); T32(hdr, buffer, 12, "Magic %08x"); T32(hdr, buffer, 16, "Version %08x"); @@ -42,15 +53,14 @@ - if (endbuf > 36) then - local tick = tree:add(booth_proto, buffer(36, endbuf-36), "Booth data") - local name = buffer(36, 64) + if (endbuf > hdr_len) then + local tick = tree:add(booth_proto, buffer(hdr_len, endbuf-hdr_len), "Booth data") + local name = buffer(hdr_len, 64) tick:add(name, "Ticket name: ", name:string()) - T32(tick, buffer, 36+64 + 0, "Leader: %08x") - T32(tick, buffer, 36+64 + 4, "Term: %08x") - T32(tick, buffer, 36+64 + 8, "Term valid for: %08x") - T32(tick, buffer, 36+64 + 12, "Leader commit: %8d") + T32(tick, buffer, hdr_len+64 + 0, "Leader: %08x") + T32(tick, buffer, hdr_len+64 + 4, "Term: %08x") + T32(tick, buffer, hdr_len+64 + 8, "Term valid for: %08x") end pinfo.cols.info = "Booth, cmd " .. cmd:string() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/booth.h new/booth/src/booth.h --- old/booth/src/booth.h 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/booth.h 2014-10-02 09:19:51.000000000 +0200 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _BOOTH_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/config.c new/booth/src/config.c --- old/booth/src/config.c 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/config.c 2014-10-02 09:19:51.000000000 +0200 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/config.h new/booth/src/config.h --- old/booth/src/config.h 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/config.h 2014-10-02 09:19:51.000000000 +0200 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _CONFIG_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/handler.c new/booth/src/handler.c --- old/booth/src/handler.c 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/handler.c 2014-10-02 09:19:51.000000000 +0200 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/handler.h new/booth/src/handler.h --- old/booth/src/handler.h 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/handler.h 2014-10-02 09:19:51.000000000 +0200 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _HANDLER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/inline-fn.h new/booth/src/inline-fn.h --- old/booth/src/inline-fn.h 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/inline-fn.h 2014-10-02 09:19:51.000000000 +0200 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _INLINE_FN_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/log.h new/booth/src/log.h --- old/booth/src/log.h 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/log.h 2014-10-02 09:19:51.000000000 +0200 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _LOG_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/main.c new/booth/src/main.c --- old/booth/src/main.c 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/main.c 2014-10-02 09:19:51.000000000 +0200 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/pacemaker.c new/booth/src/pacemaker.c --- old/booth/src/pacemaker.c 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/pacemaker.c 2014-10-02 09:19:51.000000000 +0200 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/pacemaker.h new/booth/src/pacemaker.h --- old/booth/src/pacemaker.h 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/pacemaker.h 2014-10-02 09:19:51.000000000 +0200 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _PACEMAKER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/raft.c new/booth/src/raft.c --- old/booth/src/raft.c 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/raft.c 2014-10-02 09:19:51.000000000 +0200 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/raft.h new/booth/src/raft.h --- old/booth/src/raft.h 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/raft.h 2014-10-02 09:19:51.000000000 +0200 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _RAFT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/ticket.c new/booth/src/ticket.c --- old/booth/src/ticket.c 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/ticket.c 2014-10-02 09:19:51.000000000 +0200 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/ticket.h new/booth/src/ticket.h --- old/booth/src/ticket.h 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/ticket.h 2014-10-02 09:19:51.000000000 +0200 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _TICKET_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/timer.c new/booth/src/timer.c --- old/booth/src/timer.c 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/timer.c 2014-10-02 09:19:51.000000000 +0200 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "timer.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/timer.h new/booth/src/timer.h --- old/booth/src/timer.h 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/timer.h 2014-10-02 09:19:51.000000000 +0200 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _TIMER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/transport.c new/booth/src/transport.c --- old/booth/src/transport.c 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/transport.c 2014-10-02 09:19:51.000000000 +0200 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <string.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/transport.h new/booth/src/transport.h --- old/booth/src/transport.h 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/src/transport.h 2014-10-02 09:19:51.000000000 +0200 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _TRANSPORT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/test/live_test.sh new/booth/test/live_test.sh --- old/booth/test/live_test.sh 2014-08-21 16:05:13.000000000 +0200 +++ new/booth/test/live_test.sh 2014-10-02 09:19:51.000000000 +0200 @@ -93,6 +93,14 @@ netem_delay() { ext_prog_log tc qdisc add dev $1 parent `netem_parent $1` netem delay $2ms $(($2/10))ms } +netem_duplicate() { + ext_prog_log tc qdisc add dev $1 parent `netem_parent $1` \ + netem duplicate $2\% +} +netem_reorder() { + ext_prog_log tc qdisc add dev $1 parent `netem_parent $1` \ + netem reorder $2\% $3\% delay 10ms +} netem_loss() { ext_prog_log tc qdisc add dev $1 parent `netem_parent $1` netem loss $2% } @@ -100,7 +108,9 @@ ext_prog_log tc qdisc del dev $1 root } local_netem_env() { - local fun=$1 arg=$2 + local fun=$1 + shift 1 + local args=$* local t netif="" local my_addr my_addr=`booth status | get_stat_fld booth_addr_string` @@ -119,7 +129,7 @@ # before first netem qdisc insert the prio qdisc and filter tc qdisc show dev $netif | grep -qs netem || tc_prio $netif - $fun $netif $arg + $fun $netif $args else logmsg "cannot find netif for $my_addr, netem not set" fi @@ -133,7 +143,7 @@ shift 1 echo "$h: running '$@'" | logmsg if ip a l | fgrep -wq $h; then - $@ + eval $@ else ssh $SSH_OPTS $h $@ fi @@ -147,7 +157,11 @@ runcmd $1 crm resource $2 booth } manage_arbitrator() { - runcmd $1 systemctl $2 booth(a)booth.service + if ps 1 | grep -qws systemd; then + runcmd $1 systemctl $2 booth(a)booth.service + else + runcmd $1 rcbooth-arbitrator $2 + fi } start_site() { manage_site $1 start @@ -158,7 +172,7 @@ stop_site_clean() { manage_site $1 stop && sleep 1 && - runcmd $1 crm --force site ticket revoke $tkt + runcmd $1 crm_ticket --force -t $tkt -r } stop_site() { manage_site $1 stop @@ -169,6 +183,9 @@ restart_site() { manage_site $1 restart } +reload_site() { + runcmd $1 OCF_ROOT=/usr/lib/ocf /usr/lib/ocf/resource.d/pacemaker/booth-site reload +} restart_arbitrator() { manage_arbitrator $1 restart } @@ -755,6 +772,18 @@ check_consistency `get_site 1` } +## TEST: reload_granted ## + +# reload with ticket granted +test_reload_granted() { + grant_ticket 1 || return $ERR_SETUP_FAILED + reload_site `get_site 1` || return $ERR_SETUP_FAILED + wait_timeout +} +check_reload_granted() { + check_consistency `get_site 1` +} + ## TEST: restart_granted_nocib ## # restart with ticket granted (but cib empty) @@ -771,7 +800,7 @@ check_consistency `get_site 1` } -## TEST: notgranted ## +## TEST: restart_notgranted ## # restart with ticket not granted test_restart_notgranted() { @@ -898,6 +927,16 @@ forall $0 $run_cnf __netem__ netem_delay ${1:-100} } +# duplicate packets +NETEM_ENV_duplicate() { + forall $0 $run_cnf __netem__ netem_duplicate ${1:-10} +} + +# reorder packets +NETEM_ENV_reorder() { + forall $0 $run_cnf __netem__ netem_reorder ${1:-25} ${2:-50} +} + [ -f "$cnf" ] || { echo "ERROR: configuration file $cnf doesn't exist" usage 1 @@ -961,7 +1000,7 @@ : ${TESTS:="grant longgrant grant_noarb grant_elsewhere grant_site_lost grant_site_reappear revoke simultaneous_start_even slow_start_granted -restart_granted restart_granted_nocib restart_notgranted +restart_granted reload_granted restart_granted_nocib restart_notgranted failover split_leader split_follower split_edge external_prog_failed"} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0