September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit imlib2 for openSUSE:Factory
by root＠hilbert.suse.de 09 Sep '14

09 Sep '14

Hello community, here is the log from the commit of package imlib2 for openSUSE:Factory checked in at 2014-09-09 06:21:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/imlib2 (Old) and /work/SRC/openSUSE:Factory/.imlib2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "imlib2" Changes: -------- --- /work/SRC/openSUSE:Factory/imlib2/imlib2.changes 2013-04-02 11:54:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.imlib2.new/imlib2.changes 2014-09-09 06:21:15.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 1 08:23:18 UTC 2014 - jengelh(a)inai.de + +- Edit imlib2-giflib5.patch and change a bogus >= to a > + +------------------------------------------------------------------- +Sun Jun 1 09:25:29 UTC 2014 - jengelh(a)inai.de + +- Edit imlib2-giflib5.patch to support giflib7-5.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imlib2.spec ++++++ --- /var/tmp/diff_new_pack.ryryqN/_old 2014-09-09 06:21:16.000000000 +0200 +++ /var/tmp/diff_new_pack.ryryqN/_new 2014-09-09 06:21:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package imlib2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -98,7 +98,7 @@ %prep %setup -q %patch1 -%patch2 +%patch -P 2 -p1 %build autoreconf --force --install %configure \ ++++++ imlib2-giflib5.patch ++++++ --- /var/tmp/diff_new_pack.ryryqN/_old 2014-09-09 06:21:16.000000000 +0200 +++ /var/tmp/diff_new_pack.ryryqN/_new 2014-09-09 06:21:16.000000000 +0200 @@ -1,6 +1,24 @@ ---- src/modules/loaders/loader_gif.c.orig -+++ src/modules/loaders/loader_gif.c -@@ -40,7 +40,11 @@ load(ImlibImage * im, ImlibProgressFunct +--- + src/modules/loaders/loader_gif.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +Index: imlib2-1.4.5/src/modules/loaders/loader_gif.c +=================================================================== +--- imlib2-1.4.5.orig/src/modules/loaders/loader_gif.c ++++ imlib2-1.4.5/src/modules/loaders/loader_gif.c +@@ -7,6 +7,11 @@ + #include <sys/stat.h> + #include <fcntl.h> + #include <gif_lib.h> ++#if defined(GIFLIB_MAJOR) ++# if GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) ++# define DGifCloseFile(x) DGifCloseFile(x, NULL) ++# endif ++#endif + + char + load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, +@@ -40,7 +45,11 @@ load(ImlibImage * im, ImlibProgressFunct #endif if (fd < 0) return 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit u-boot for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2014-09-08 21:29:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "u-boot" Changes: -------- --- /work/SRC/openSUSE:Factory/u-boot/u-boot-am335xevm.changes 2014-08-01 07:08:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-am335xevm.changes 2014-09-08 21:30:36.000000000 +0200 @@ -1,0 +2,41 @@ +Mon Sep 8 13:06:52 UTC 2014 - guillaume(a)opensuse.org + +- Drop Hyundai_a7hd and cubox-i boards (now handle in Contrib repos +since it is not upstreamed), so drop related patches: + * v2014.04-sunxi.patch + * cubox-i-v2014.04-port.patch + * cubox-i-enable_raw_rd.patch + +------------------------------------------------------------------- +Wed Sep 3 12:02:22 UTC 2014 - guillaume(a)opensuse.org + +- Update to version 2014.10-rc2 +- drop upstreamed patch rpi_b-bootscr.patch +- drop fix_spl_build_for_am335x.patch (does build without it) +- Refresh patches: + * drop-marvell.patch + * fix_snow_config.patch + +------------------------------------------------------------------- +Thu Aug 21 08:50:10 UTC 2014 - guillaume(a)opensuse.org + +- Update SPL EXT fs support: + * For omap boards (beagle and panda), SPL now looks for u-boot.img + as upstream instead of u-boot.bin + * Remove mlo-ext2.patch to make proper patches in +order to ease upstreaming our EXT fs SPL functions + * Add panda-bootscr.patch to fix panda boot (was included in + mlo-ext2.patch) + * Add fix_omap_boot_mode.patch to fix beagle and panda boot mode + (was included in mlo-ext2.patch) + * Add add_spl_extfs_support.patch to get proper SPL EXT fs functions + * Add enable_spl_ext_support_for_ti_armv7.patch to enable SPL EXT fs + support for TI ARMv7 boards + + +------------------------------------------------------------------- +Tue Aug 19 17:35:22 UTC 2014 - matwey.kornilov(a)gmail.com + +- Update to version 2014.10-rc1 and update patches + +------------------------------------------------------------------- u-boot-arndale.changes: same change u-boot-colibrit20iris.changes: same change u-boot-cubieboard.changes: same change u-boot-cubieboard2.changes: same change u-boot-cubietruck.changes: same change u-boot-highbank.changes: same change u-boot-melea1000.changes: same change u-boot-mx53loco.changes: same change u-boot-mx6qsabrelite.changes: same change u-boot-omap3beagle.changes: same change u-boot-omap4panda.changes: same change u-boot-paz00.changes: same change u-boot-rpib.changes: same change u-boot-snow.changes: same change u-boot-vexpressaemv8a.changes: same change u-boot.changes: same change Old: ---- cubox-i-enable_raw_rd.patch cubox-i-v2014.04-port.patch fix_spl_build_for_am335x.patch mlo-ext2.patch openSUSE_panda.txt rpi_b-bootscr.patch u-boot-2014.04.tar.bz2 u-boot-hyundaia7hd.changes u-boot-hyundaia7hd.spec u-boot-mx6cubox-i.changes u-boot-mx6cubox-i.spec v2014.04-sunxi.patch New: ---- add_spl_extfs_support.patch drop-marvell.patch enable_spl_ext_support_for_ti_armv7.patch fix_omap_boot_mode.patch panda-bootscr.patch u-boot-2014.10-rc2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-am335xevm.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-am335xevm -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the am335xevm arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" am335x_evm_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" am335x_evm_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -117,15 +112,15 @@ %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin +install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then - install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin -elif [ -f u-boot-dtb.bin ]; then - install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot-dtb-tegra.img %{buildroot}/boot/u-boot.img +elif [ -f u-boot-dtb.img ]; then + install -D -m 0644 u-boot-dtb.img %{buildroot}/boot/u-boot.img else - install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img fi %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-arndale.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-arndale -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the arndale arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" arndale_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" arndale_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-colibrit20iris.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-colibrit20iris -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the colibrit20iris arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" colibri_t20_iris_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" colibri_t20_iris_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-cubieboard.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-cubieboard -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the cubieboard arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubieboard_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubieboard_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-cubieboard2.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-cubieboard2 -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the cubieboard2 arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubieboard2_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubieboard2_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-cubietruck.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-cubietruck -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the cubietruck arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubietruck_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubietruck_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-highbank.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-highbank -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the highbank arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" highbank_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" highbank_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-melea1000.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-melea1000 -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the melea1000 arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Mele_A1000_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Mele_A1000_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-mx53loco.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-mx53loco -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the mx53loco arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx53loco_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx53loco_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-mx6qsabrelite.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-mx6qsabrelite -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the mx6qsabrelite arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx6qsabrelite_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx6qsabrelite_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-omap3beagle.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-omap3beagle -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the omap3beagle arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap3_beagle_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap3_beagle_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -117,15 +112,15 @@ %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin +install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then - install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin -elif [ -f u-boot-dtb.bin ]; then - install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot-dtb-tegra.img %{buildroot}/boot/u-boot.img +elif [ -f u-boot-dtb.img ]; then + install -D -m 0644 u-boot-dtb.img %{buildroot}/boot/u-boot.img else - install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img fi %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-omap4panda.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-omap4panda -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the omap4panda arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap4_panda_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap4_panda_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -117,15 +112,15 @@ %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin +install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then - install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin -elif [ -f u-boot-dtb.bin ]; then - install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot-dtb-tegra.img %{buildroot}/boot/u-boot.img +elif [ -f u-boot-dtb.img ]; then + install -D -m 0644 u-boot-dtb.img %{buildroot}/boot/u-boot.img else - install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img fi %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-paz00.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-paz00 -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the paz00 arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" paz00_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" paz00_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-rpib.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-rpib -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the rpib arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" rpi_b_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" rpi_b_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-snow.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-snow -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the snow arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" snow_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" snow_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-vexpressaemv8a.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-vexpressaemv8a -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the vexpressaemv8a arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" vexpress_aemv8a_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" vexpress_aemv8a_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -19,13 +19,16 @@ Name: u-boot -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: Tools for the u-boot Firmware License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: u-boot-%{version}.tar.bz2 +#Source: u-boot-%{version}.tar.bz2 +Source: u-boot-2014.10-rc2.tar.bz2 +BuildRequires: libopenssl-devel +BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,9 +47,13 @@ mkimage- a tool that creates kernel bootable images for u-boot. %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 %build +# needed for include/config/auto.conf +make defconfig +make silentoldconfig make USE_PRIVATE_LIBGG=yes tools-only %install ++++++ add_spl_extfs_support.patch ++++++ --- ./include/spl.h.orig 2014-08-21 09:49:13.104157699 +0200 +++ ./include/spl.h 2014-08-21 09:49:55.343156204 +0200 @@ -72,6 +72,10 @@ void spl_sata_load_image(void); int spl_load_image_fat(block_dev_desc_t *block_dev, int partition, const char *filename); int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition); +/* SPL EXT image functions */ +int spl_load_image_ext(block_dev_desc_t *block_dev, int partition, const char *filename); +int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition); + #ifdef CONFIG_SPL_BOARD_INIT void spl_board_init(void); #endif --- ./common/spl/Makefile.orig 2014-08-21 09:55:50.011143645 +0200 +++ ./common/spl/Makefile 2014-08-21 09:56:05.061143112 +0200 @@ -18,5 +18,6 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += spl_net obj-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o obj-$(CONFIG_SPL_USB_SUPPORT) += spl_usb.o obj-$(CONFIG_SPL_FAT_SUPPORT) += spl_fat.o +obj-$(CONFIG_SPL_EXT_SUPPORT) += spl_ext.o obj-$(CONFIG_SPL_SATA_SUPPORT) += spl_sata.o endif --- ./fs/Makefile.orig 2014-08-21 09:58:00.612139021 +0200 +++ ./fs/Makefile 2014-08-21 09:58:15.603138490 +0200 @@ -8,6 +8,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/ +obj-$(CONFIG_SPL_EXT_SUPPORT) += ext4/ else obj-y += fs.o --- /dev/null 2014-08-21 08:33:45.854318006 +0200 +++ common/spl/spl_ext.c 2014-08-21 10:26:03.376079435 +0200 @@ -0,0 +1,139 @@ +/* + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <spl.h> +#include <asm/u-boot.h> +#include <ext4fs.h> +#include <image.h> + +#ifdef CONFIG_SPL_EXT_SUPPORT +int spl_load_image_ext(block_dev_desc_t *block_dev, + int partition, + const char *filename) +{ + s32 err; + struct image_header *header; + int filelen; + disk_partition_t part_info = {}; + + header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - + sizeof(struct image_header)); + + if (get_partition_info(block_dev, + partition, &part_info)) { + printf("spl: no partition table found\n"); + goto end; + } + + ext4fs_set_blk_dev(block_dev, &part_info); + + err = ext4fs_mount(0); + if (!err) { +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT + printf("%s: ext4fs mount err - %d\n", __func__, err); +#endif + goto end; + } + + filelen = err = ext4fs_open(filename); + if (err < 0) { + puts("spl: ext4fs_open failed\n"); + goto end; + } + err = ext4fs_read((u8 *)header, sizeof(struct image_header)); + if (err <= 0) { + puts("spl: ext4fs_read failed\n"); + goto end; + } + + spl_parse_image_header(header); + + err = ext4fs_read((u8 *)spl_image.load_addr, filelen); + +end: +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT + if (err <= 0) + printf("%s: error reading image %s, err - %d\n", + __func__, filename, err); +#endif + + return (err <= 0); +} + +#ifdef CONFIG_SPL_OS_BOOT +int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition) +{ + int err; + int filelen; + disk_partition_t part_info = {}; + __maybe_unused char *file; + + if (get_partition_info(block_dev, + partition, &part_info)) { + printf("spl: no partition table found\n"); + return -1; + } + + ext4fs_set_blk_dev(block_dev, &part_info); + + err = ext4fs_mount(0); + if (!err) { +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT + printf("%s: ext4fs mount err - %d\n", __func__, err); +#endif + return -1; + } + +#if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT) + file = getenv("falcon_args_file"); + if (file) { + filelen = err = ext4fs_open(file); + if (err < 0) { + puts("spl: ext4fs_open failed\n"); + goto defaults; + } + err = ext4fs_read( (void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen); + if (err <= 0) { + printf("spl: error reading image %s, err - %d, falling back to default\n", + file, err); + goto defaults; + } + file = getenv("falcon_image_file"); + if (file) { + err = spl_load_image_ext(block_dev, partition, file); + if (err != 0) { + puts("spl: falling back to default\n"); + goto defaults; + } + + return 0; + } else + puts("spl: falcon_image_file not set in environment, falling back to default\n"); + } else + puts("spl: falcon_args_file not set in environment, falling back to default\n"); + +defaults: +#endif + + filelen = err = ext4fs_open(CONFIG_SPL_FAT_LOAD_ARGS_NAME); + if (err < 0) { + puts("spl: ext4fs_open failed\n"); + //goto defaults; + } + err = ext4fs_read( (void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen); + if (err <= 0) { +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT + printf("%s: error reading image %s, err - %d\n", + __func__, CONFIG_SPL_FAT_LOAD_ARGS_NAME, err); +#endif + return -1; + } + + return spl_load_image_ext(block_dev, partition, + CONFIG_SPL_FAT_LOAD_KERNEL_NAME); +} +#endif +#endif + --- common/spl/spl_mmc.c.orig 2014-08-06 15:12:58.000000000 +0200 +++ common/spl/spl_mmc.c 2014-08-21 10:38:25.144053170 +0200 @@ -100,6 +102,17 @@ void spl_mmc_load_image(void) #endif err = mmc_load_image_raw(mmc, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); +#ifdef CONFIG_SPL_EXT_SUPPORT + } else if (boot_mode == MMCSD_MODE_FAT) { + debug("boot mode - EXT\n"); +#ifdef CONFIG_SPL_OS_BOOT + if (spl_start_uboot() || spl_load_image_ext_os(&mmc->block_dev, + CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION)) +#endif + err = spl_load_image_ext(&mmc->block_dev, + CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION, + CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME); +#endif #ifdef CONFIG_SPL_FAT_SUPPORT } else if (boot_mode == MMCSD_MODE_FAT) { debug("boot mode - FAT\n"); ++++++ am335x_evm-bootscr.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,8 +1,8 @@ -Index: u-boot-2013.10/include/configs/am335x_evm.h +Index: u-boot-2014.10-rc1/include/configs/am335x_evm.h =================================================================== ---- u-boot-2013.10.orig/include/configs/am335x_evm.h -+++ u-boot-2013.10/include/configs/am335x_evm.h -@@ -97,6 +97,9 @@ +--- u-boot-2014.10-rc1.orig/include/configs/am335x_evm.h ++++ u-boot-2014.10-rc1/include/configs/am335x_evm.h +@@ -115,6 +115,9 @@ "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ "ip=dhcp\0" \ "bootenv=uEnv.txt\0" \ @@ -11,8 +11,8 @@ + "source ${loadaddr}\0" \ "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ "importbootenv=echo Importing environment from mmc ...; " \ - "env import -t $loadaddr $filesize\0" \ -@@ -125,17 +128,21 @@ + "env import -t -r $loadaddr $filesize\0" \ +@@ -142,17 +145,21 @@ "mmcboot=mmc dev ${mmcdev}; " \ "if mmc rescan; then " \ "echo SD/MMC found on device ${mmcdev};" \ ++++++ arndale.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,6 +1,8 @@ ---- ./include/configs/arndale.h.orig 2013-11-26 14:20:52.645451329 +0100 -+++ ./include/configs/arndale.h 2013-11-26 15:05:07.495703179 +0100 -@@ -74,9 +74,6 @@ +Index: include/configs/arndale.h +=================================================================== +--- include/configs/arndale.h.orig ++++ include/configs/arndale.h +@@ -72,9 +72,6 @@ "stdout=serial\0" \ "stderr=serial\0" @@ -10,7 +12,7 @@ /* SD/MMC configuration */ #define CONFIG_GENERIC_MMC #define CONFIG_MMC -@@ -106,6 +103,8 @@ +@@ -105,6 +102,8 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_NET #define CONFIG_CMD_HASH @@ -19,7 +21,7 @@ #define CONFIG_BOOTDELAY 3 #define CONFIG_ZERO_BOOTDELAY_CHECK -@@ -127,7 +126,23 @@ +@@ -130,7 +129,23 @@ #define CONFIG_SPL_TEXT_BASE 0x02023400 #define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024) ++++++ beagle-bootscr.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,16 +1,27 @@ ---- include/configs/omap3_beagle.h.orig 2013-11-21 15:44:37.041667288 +0100 -+++ include/configs/omap3_beagle.h 2013-11-21 15:47:25.589580653 +0100 -@@ -264,6 +264,9 @@ +Index: include/configs/omap3_beagle.h +=================================================================== +--- include/configs/omap3_beagle.h.orig ++++ include/configs/omap3_beagle.h +@@ -193,7 +193,7 @@ + "fi; " \ + "fi; \0" \ + "bootenv=uEnv.txt\0" \ +- "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ ++ "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ + "importbootenv=echo Importing environment from mmc ...; " \ + "env import -t -r $loadaddr $filesize\0" \ + "ramargs=setenv bootargs console=${console} " \ +@@ -207,6 +207,9 @@ "rootfstype=${ramrootfstype}\0" \ "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ + "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ + "source ${loadaddr}\0" \ - "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + "loadfdt=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ -@@ -300,9 +303,13 @@ +@@ -243,9 +246,13 @@ "echo Running uenvcmd ...;" \ "run uenvcmd;" \ "fi;" \ ++++++ drop-marvell.patch ++++++ Index: u-boot-2014.10-rc1/arch/arm/Kconfig =================================================================== --- u-boot-2014.10-rc1.orig/arch/arm/Kconfig +++ u-boot-2014.10-rc1/arch/arm/Kconfig @@ -545,9 +545,6 @@ source "board/BuR/tseries/Kconfig" source "board/BuS/eb_cpux9k2/Kconfig" source "board/BuS/vl_ma2sc/Kconfig" source "board/CarMediaLab/flea3/Kconfig" -source "board/Marvell/aspenite/Kconfig" -source "board/Marvell/dkb/Kconfig" -source "board/Marvell/gplugd/Kconfig" source "board/afeb9260/Kconfig" source "board/altera/socfpga/Kconfig" source "board/armadeus/apf27/Kconfig" Index: u-boot-2014.10-rc1/arch/arm/cpu/arm926ejs/kirkwood/Kconfig =================================================================== --- u-boot-2014.10-rc1.orig/arch/arm/cpu/arm926ejs/kirkwood/Kconfig +++ u-boot-2014.10-rc1/arch/arm/cpu/arm926ejs/kirkwood/Kconfig @@ -67,12 +67,6 @@ config SYS_SOC string default "kirkwood" -source "board/Marvell/openrd/Kconfig" -source "board/Marvell/mv88f6281gtw_ge/Kconfig" -source "board/Marvell/rd6281a/Kconfig" -source "board/Marvell/dreamplug/Kconfig" -source "board/Marvell/guruplug/Kconfig" -source "board/Marvell/sheevaplug/Kconfig" source "board/buffalo/lsxl/Kconfig" source "board/cloudengines/pogo_e02/Kconfig" source "board/d-link/dns325/Kconfig" Index: u-boot-2014.10-rc1/arch/powerpc/cpu/74xx_7xx/Kconfig =================================================================== --- u-boot-2014.10-rc1.orig/arch/powerpc/cpu/74xx_7xx/Kconfig +++ u-boot-2014.10-rc1/arch/powerpc/cpu/74xx_7xx/Kconfig @@ -37,8 +37,6 @@ config TARGET_P3MX endchoice -source "board/Marvell/db64360/Kconfig" -source "board/Marvell/db64460/Kconfig" source "board/eltec/elppc/Kconfig" source "board/esd/cpci750/Kconfig" source "board/evb64260/Kconfig" ++++++ enable_spl_ext_support_for_ti_armv7.patch ++++++ --- include/configs/ti_armv7_common.h.orig 2014-08-21 10:41:47.979045987 +0200 +++ include/configs/ti_armv7_common.h 2014-08-21 10:42:12.325045125 +0200 @@ -250,6 +250,7 @@ #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT +#define CONFIG_SPL_EXT_SUPPORT #endif /* General parts of the framework, required. */ ++++++ exynos5-dt.h.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,5 +1,7 @@ ---- include/configs/exynos5-dt.h.orig 2014-02-04 10:19:32.915229302 +0100 -+++ include/configs/exynos5-dt.h 2014-02-05 16:15:04.818804877 +0100 +Index: include/configs/exynos5-dt.h +=================================================================== +--- include/configs/exynos5-dt.h.orig ++++ include/configs/exynos5-dt.h @@ -83,12 +83,25 @@ #define CONFIG_CONSOLE_MUX #define CONFIG_SYS_CONSOLE_IS_IN_ENV ++++++ fix_omap_boot_mode.patch ++++++ Index: arch/arm/cpu/armv7/omap3/board.c =================================================================== --- arch/arm/cpu/armv7/omap3/board.c.orig +++ arch/arm/cpu/armv7/omap3/board.c @@ -61,6 +61,8 @@ u32 omap3_boot_device = BOOT_DEVICE_NAND /* auto boot mode detection is not possible for OMAP3 - hard code */ u32 spl_boot_mode(void) { + return MMCSD_MODE_FAT; + switch (spl_boot_device()) { case BOOT_DEVICE_MMC2: return MMCSD_MODE_RAW; Index: common/spl/spl_mmc.c.orig =================================================================== --- common/spl/spl_mmc.c.orig 2014-08-06 15:12:58.000000000 +0200 +++ common/spl/spl_mmc.c 2014-08-21 10:38:25.144053170 +0200 @@ -92,7 +92,9 @@ void spl_mmc_load_image(void) hang(); } - boot_mode = spl_boot_mode(); +// boot_mode = spl_boot_mode(); + boot_mode = MMCSD_MODE_FAT; /* Fix OMAP4 boot */ + if (boot_mode == MMCSD_MODE_RAW) { debug("boot mode - RAW\n"); #ifdef CONFIG_SPL_OS_BOOT ++++++ fix_sabrelite_boot.scr.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,6 +1,8 @@ ---- ./include/configs/nitrogen6x.h.orig 2014-03-31 23:17:24.341995637 +0200 -+++ ./include/configs/nitrogen6x.h 2014-04-03 10:07:06.314594508 +0200 -@@ -183,13 +183,12 @@ +Index: include/configs/nitrogen6x.h +=================================================================== +--- include/configs/nitrogen6x.h.orig ++++ include/configs/nitrogen6x.h +@@ -186,13 +186,12 @@ "fdt_addr=0x18000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ @@ -16,7 +18,7 @@ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ -@@ -235,16 +234,14 @@ +@@ -238,16 +237,14 @@ "fi;\0" #define CONFIG_BOOTCOMMAND \ ++++++ fix_snow_config.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,8 +1,10 @@ ---- include/configs/snow.h.orig 2014-02-04 10:21:12.328756964 +0100 -+++ include/configs/snow.h 2014-02-05 16:15:08.265722911 +0100 -@@ -14,4 +14,31 @@ - #undef CONFIG_DEFAULT_DEVICE_TREE - #define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow +Index: include/configs/snow.h +=================================================================== +--- include/configs/snow.h.orig ++++ include/configs/snow.h +@@ -18,4 +18,31 @@ + #define CONFIG_FIT + #define CONFIG_FIT_BEST_MATCH +#undef CONFIG_BOOTCOMMAND +#define CONFIG_BOOTCOMMAND \ @@ -25,7 +27,7 @@ +#define CONFIG_PRE_CON_BUF_SZ 0x100000 +#define CONFIG_PRE_CON_BUF_ADDR 0x41f00000 + -+#define DEBUG ++/*#define DEBUG*/ +#undef CONFIG_SPL +#undef CONFIG_SYS_THUMB_BUILD +#undef CONFIG_SYS_ARM_CACHE_WRITETHROUGH ++++++ mx53loco-bootscr.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,6 +1,8 @@ ---- include/configs/mx53loco.h.orig 2014-04-14 21:19:24.000000000 +0200 -+++ include/configs/mx53loco.h 2014-04-29 11:53:24.669579194 +0200 -@@ -92,6 +92,7 @@ +Index: include/configs/mx53loco.h +=================================================================== +--- include/configs/mx53loco.h.orig ++++ include/configs/mx53loco.h +@@ -94,6 +94,7 @@ /* Command definition */ #include <config_cmd_default.h> #define CONFIG_CMD_BOOTZ @@ -8,7 +10,7 @@ #undef CONFIG_CMD_IMLS -@@ -114,11 +115,11 @@ +@@ -116,11 +117,11 @@ "mmcroot=/dev/mmcblk0p2 rw rootwait\0" \ "mmcargs=setenv bootargs console=ttymxc0,${baudrate} root=${mmcroot}\0" \ "loadbootscript=" \ ++++++ origen-ext2.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,5 +1,7 @@ ---- include/configs/origen.h.orig 2014-04-29 14:10:29.864588285 +0200 -+++ include/configs/origen.h 2014-04-29 14:15:44.511098108 +0200 +Index: include/configs/origen.h +=================================================================== +--- include/configs/origen.h.orig ++++ include/configs/origen.h @@ -61,6 +61,9 @@ #undef CONFIG_CMD_PING #define CONFIG_CMD_ELF @@ -10,7 +12,7 @@ #undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS -@@ -69,7 +72,35 @@ +@@ -68,7 +71,35 @@ #define COPY_BL2_FNPTR_ADDR 0x02020030 #define CONFIG_SPL_TEXT_BASE 0x02021410 ++++++ panda-bootscr.patch ++++++ Index: include/configs/ti_omap4_common.h =================================================================== --- include/configs/ti_omap4_common.h.orig +++ include/configs/ti_omap4_common.h @@ -102,10 +102,10 @@ "vram=${vram} " \ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype}\0" \ - "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ "source ${loadaddr}\0" \ - "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ + "loadbootenv=load mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ "env import -t ${loadaddr} ${filesize}\0" \ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -5,28 +5,28 @@ ARCH_RESTRICTIONS="$3 $4" armv6_boards="rpi_b" -armv7_boards="omap3_beagle omap4_panda am335x_evm arndale highbank mx53loco mx6qsabrelite Cubieboard Cubieboard2 Cubietruck Hyundai_A7HD Mele_A1000 colibri_t20_iris paz00 snow mx6_cubox-i" +armv7_boards="omap3_beagle omap4_panda am335x_evm arndale highbank mx53loco mx6qsabrelite Cubieboard Cubieboard2 Cubietruck Mele_A1000 colibri_t20_iris paz00 snow" aarch64_boards="vexpress_aemv8a" if [ ! "$1" -o ! "$2" -o ! "$3" ]; then # armv6 boards for BOARDCONFIG in $armv6_boards; do BOARDNAME="$(echo $BOARDCONFIG | tr -d '_' | tr '[:upper:]' '[:lower:]')" - BOARDCONFIG=${BOARDCONFIG}_config + BOARDCONFIG=${BOARDCONFIG}_defconfig ARCH_RESTRICTIONS="armv6l armv6hl" bash $0 $BOARDNAME $BOARDCONFIG $ARCH_RESTRICTIONS done # armv7 boards for BOARDCONFIG in $armv7_boards; do BOARDNAME="$(echo $BOARDCONFIG | tr -d '_' | tr '[:upper:]' '[:lower:]')" - BOARDCONFIG=${BOARDCONFIG}_config + BOARDCONFIG=${BOARDCONFIG}_defconfig ARCH_RESTRICTIONS="armv7l armv7hl" bash $0 $BOARDNAME $BOARDCONFIG $ARCH_RESTRICTIONS done # aarch64 boards for BOARDCONFIG in $aarch64_boards; do BOARDNAME="$(echo $BOARDCONFIG | tr -d '_' | tr '[:upper:]' '[:lower:]')" - BOARDCONFIG=${BOARDCONFIG}_config + BOARDCONFIG=${BOARDCONFIG}_defconfig ARCH_RESTRICTIONS="aarch64" bash $0 $BOARDNAME $BOARDCONFIG $ARCH_RESTRICTIONS done @@ -40,7 +40,7 @@ CUBOXI_SPL=0 case "$BOARDCONFIG" in mx53loco*|mx6qsabrelite*|efika*) BINEND=imx ;; -*omap*|*am335x*) BINEND=bin +*omap*|*am335x*) BINEND=img XLOADER=1 ;; *arndale*) BINEND=bin ARNDALE_SPL=1 ;; ++++++ ti_common_initrd_support.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,6 +1,8 @@ ---- ./include/configs/ti_armv7_common.h.orig 2013-12-17 15:08:07.380596872 +0100 -+++ ./include/configs/ti_armv7_common.h 2013-12-17 15:08:30.370055488 +0100 -@@ -149,6 +149,7 @@ +Index: include/configs/ti_armv7_common.h +=================================================================== +--- include/configs/ti_armv7_common.h.orig ++++ include/configs/ti_armv7_common.h +@@ -174,6 +174,7 @@ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_ECHO #define CONFIG_CMD_BOOTZ ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl CUBOXI_SPL Name: u-boot-BOARDNAME -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the BOARDNAME arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,35 +76,29 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit global for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package global for openSUSE:Factory checked in at 2014-09-08 21:29:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/global (Old) and /work/SRC/openSUSE:Factory/.global.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "global" Changes: -------- --- /work/SRC/openSUSE:Factory/global/global.changes 2012-06-01 07:20:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.global.new/global.changes 2014-09-08 21:30:33.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 8 15:06:07 UTC 2014 - puzel(a)suse.com + +- update to globa-6.3.2 +- see /usr/share/doc/packages/global/NEWS for complete list + of changes since 6.2.4 + +------------------------------------------------------------------- Old: ---- global-6.2.4.tar.gz New: ---- global-6.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ global.spec ++++++ --- /var/tmp/diff_new_pack.yus75c/_old 2014-09-08 21:30:35.000000000 +0200 +++ /var/tmp/diff_new_pack.yus75c/_new 2014-09-08 21:30:35.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package global # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: global -Version: 6.2.4 +Version: 6.3.2 Release: 0 Summary: Common source code tag system License: GPL-3.0 @@ -40,8 +40,8 @@ %prep %setup -q -%patch0 -%patch1 +%patch0 -p1 +%patch1 -p1 %patch3 -p1 %build ++++++ global-5.7-gcc.diff ++++++ --- /var/tmp/diff_new_pack.yus75c/_old 2014-09-08 21:30:35.000000000 +0200 +++ /var/tmp/diff_new_pack.yus75c/_new 2014-09-08 21:30:35.000000000 +0200 @@ -1,13 +1,17 @@ -Index: htags/lexcommon.h +--- + htags/lexcommon.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: global-6.3.2/htags/lexcommon.h =================================================================== ---- htags/lexcommon.h.orig 2009-03-14 01:30:37.000000000 +0100 -+++ htags/lexcommon.h 2009-03-16 16:16:11.000000000 +0100 -@@ -49,7 +49,7 @@ - * and PREPROCESSOR_LINE as %start values, even if they are not used. - * It assumed that CPP_COMMENT and SHELL_COMMENT is one line comment. +--- global-6.3.2.orig/htags/lexcommon.h ++++ global-6.3.2/htags/lexcommon.h +@@ -55,7 +55,7 @@ to generate language specific symbols. + * It assumed that @VAR{CPP_COMMENT} and @VAR{SHELL_COMMENT} is one line comment. */ + /** @{ */ -static int lexcommon_lineno; +int lexcommon_lineno; static int begin_line; - /* - * If you want newline to terminate string, set this variable to 1. + /** @} */ + ++++++ global-5.7.diff ++++++ --- /var/tmp/diff_new_pack.yus75c/_old 2014-09-08 21:30:35.000000000 +0200 +++ /var/tmp/diff_new_pack.yus75c/_new 2014-09-08 21:30:35.000000000 +0200 @@ -1,13 +1,17 @@ -Index: Makefile.am +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: global-6.3.2/Makefile.am =================================================================== ---- Makefile.am.orig -+++ Makefile.am +--- global-6.3.2.orig/Makefile.am ++++ global-6.3.2/Makefile.am @@ -20,7 +20,7 @@ if USE_GTAGSCSCOPE SUBDIRS += gtags-cscope endif -gtagsdir = ${datadir}/gtags +gtagsdir = ${datadir}/doc/packages/global - gtags_DATA = AUTHORS COPYING ChangeLog FAQ INSTALL LICENSE NEWS README THANKS \ + gtags_DATA = AUTHORS COPYING COPYING.LIB ChangeLog FAQ INSTALL LICENSE NEWS README THANKS \ + BOKIN_MODEL BOKIN_MODEL_FAQ DONORS BUILD_TOOLS \ gtags.conf gtags.el gtags.pl gtags.vim gtags-cscope.vim \ - BOKIN_MODEL BOKIN_MODEL_FAQ DONORS elvis.rc elvis-2.2_0.patch ++++++ global-5.9.5-fix-gcc-warnings.patch ++++++ --- /var/tmp/diff_new_pack.yus75c/_old 2014-09-08 21:30:35.000000000 +0200 +++ /var/tmp/diff_new_pack.yus75c/_new 2014-09-08 21:30:35.000000000 +0200 @@ -1,12 +1,16 @@ -Index: global-5.9.5/gtags-cscope/exec.c +--- + gtags-cscope/exec.c | 1 + + 1 file changed, 1 insertion(+) + +Index: global-6.3.2/gtags-cscope/exec.c =================================================================== ---- global-5.9.5.orig/gtags-cscope/exec.c -+++ global-5.9.5/gtags-cscope/exec.c -@@ -128,6 +128,7 @@ myexecvp(char *a, char **args) +--- global-6.3.2.orig/gtags-cscope/exec.c ++++ global-6.3.2/gtags-cscope/exec.c +@@ -135,6 +135,7 @@ myexecvp(char *a, char **args) askforreturn(); /* wait until the user sees the message */ myexit(1); /* exit the child */ /* NOTREACHED */ + return 0; /* make gcc happy */ } - /* myfork acts like fork but also handles signals */ + /** myfork acts like fork but also handles signals */ ++++++ global-6.2.4.tar.gz -> global-6.3.2.tar.gz ++++++ ++++ 107901 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 aegisub for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package aegisub for openSUSE:Factory checked in at 2014-09-08 21:29:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aegisub (Old) and /work/SRC/openSUSE:Factory/.aegisub.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aegisub" Changes: -------- --- /work/SRC/openSUSE:Factory/aegisub/aegisub.changes 2014-08-25 11:04:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aegisub.new/aegisub.changes 2014-09-08 21:30:30.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 8 13:03:42 UTC 2014 - coolo(a)suse.com + +- remove conflict with lua 5.2, seems outdated + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aegisub.spec ++++++ --- /var/tmp/diff_new_pack.Lc4haL/_old 2014-09-08 21:30:33.000000000 +0200 +++ /var/tmp/diff_new_pack.Lc4haL/_new 2014-09-08 21:30:33.000000000 +0200 @@ -47,7 +47,6 @@ BuildRequires: pkgconfig(hunspell) >= 1.2.0 BuildRequires: pkgconfig(libass) BuildRequires: pkgconfig(libpulse) >= 0.5 -BuildRequires: pkgconfig(lua) < 5.2 BuildRequires: pkgconfig(lua) >= 5.1 BuildRequires: pkgconfig(zlib) %if %{with ffms2} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lomt-fonts for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package lomt-fonts for openSUSE:Factory checked in at 2014-09-08 21:29:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lomt-fonts (Old) and /work/SRC/openSUSE:Factory/.lomt-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lomt-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/lomt-fonts/lomt-fonts.changes 2014-03-28 13:16:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lomt-fonts.new/lomt-fonts.changes 2014-09-08 21:30:27.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 8 13:48:17 UTC 2014 - jengelh(a)inai.de + +- Stop producing lomt-raleway-fonts subrpm, since we have a better, + separate package: raleway-fonts. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lomt-fonts.spec ++++++ --- /var/tmp/diff_new_pack.6nVOiv/_old 2014-09-08 21:30:30.000000000 +0200 +++ /var/tmp/diff_new_pack.6nVOiv/_new 2014-09-08 21:30:30.000000000 +0200 @@ -135,22 +135,6 @@ the animal species known as the raccoon.) It is a roman serif font with blackletter elements. -%package -n lomt-raleway-fonts -Summary: League Of Movable Type's "Raleway" font -License: OFL-1.1 -Group: System/X11/Fonts -# raleway-fonts is derivative work from Pablo Impallari -# and Rodrigo Fuenzalida -Conflicts: raleway-fonts - -%description -n lomt-raleway-fonts -Raleway is an elegant sans-serif typeface, designed in a single thin -weight. It is a display face that features both old style and lining -numerals, standard and discretionary ligatures, a pretty complete set -of diacritics, as well as a stylistic alternate inspired by more -geometric sans-serif typefaces than it's neo-grotesque inspired -default character set. - %package -n lomt-script1-fonts Summary: League Of Movable Type's "League Script Number One" font License: OFL-1.1 @@ -193,9 +177,11 @@ for i in *\ *.{otf,ttf}; do mv -v "$i" "${i// /_}"; done; + +# An improved Raleway is already provided in a separate package we have, +# in raleway-fonts. +rm -f Raleway*.[ot]tf install -pm0644 *.otf *.ttf "$c/"; -mkdir -p "%buildroot/etc"; -echo hi >"%buildroot/etc/hi world.conf"; %reconfigure_fonts_scriptlets -n lomt-blackout-fonts %reconfigure_fonts_scriptlets -n lomt-chunk-fonts @@ -208,7 +194,6 @@ %reconfigure_fonts_scriptlets -n lomt-orbitron-fonts %reconfigure_fonts_scriptlets -n lomt-ostrichsans-fonts %reconfigure_fonts_scriptlets -n lomt-prociono-fonts -%reconfigure_fonts_scriptlets -n lomt-raleway-fonts %reconfigure_fonts_scriptlets -n lomt-script1-fonts %reconfigure_fonts_scriptlets -n lomt-sniglet-fonts %reconfigure_fonts_scriptlets -n lomt-sortsmillgoudy-fonts @@ -279,12 +264,6 @@ %_ttfontsdir/Prociono.otf %doc prociono.markdown -%files -n lomt-raleway-fonts -%defattr(-,root,root) -%dir %_ttfontsdir -%_ttfontsdir/Raleway*.otf -%doc raleway.markdown - %files -n lomt-script1-fonts %defattr(-,root,root) %dir %_ttfontsdir @@ -302,6 +281,5 @@ %dir %_ttfontsdir %_ttfontsdir/OFLGoudyStM*.otf %doc sorts-mill-goudy.markdown -%_sysconfdir/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lxmusic for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package lxmusic for openSUSE:Factory checked in at 2014-09-08 21:29:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxmusic (Old) and /work/SRC/openSUSE:Factory/.lxmusic.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxmusic" Changes: -------- --- /work/SRC/openSUSE:Factory/lxmusic/lxmusic.changes 2012-06-26 17:06:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxmusic.new/lxmusic.changes 2014-09-08 21:30:25.000000000 +0200 @@ -1,0 +2,35 @@ +Sat Sep 6 17:37:44 UTC 2014 - trcs(a)gmx.com + +- new upstream version 0.4.6 + * Add manual page lxmusic.1 to install + * Replace g_format_size_for_display() with glib >= 2.30 as + deprecated + * Fixed few invalid casts and deprecated gdk_pixbuf_unref() calls + * Properly return NULL from lxmusic_do_notify_prepare() if no + libnotify available + * [SF#252]Destroy any dialog windows on exit + * Avoid duplicate gtk_widget_destroy() on main window - it + crashes on exit + * [SF#316]update_track() should not use GtkTreeIter - it may + become invalid ATM + * [SF#335]Safeguard against NULL passed to guess_title_from_url() + * Safeguards for xmmsv_get_*() -- we should use it only if + xmmsv_dict_get() was success + * Use macro AM_MAINTAINER_MODE correct way - with ([enable]) + * Fix $(desktop_in_files) missing in distro tarball + * Fix crash if "id" is not available + * [SF#506]Correct Name in the desktop entry file, it should + differ from GenericName + * Add .gitignore file + * autogen.sh: update check for automake version and remove never + used libtoolize call + * Add compatibility with libnotify >= 0.7.0 + * Generate po/LINGUAS file on the fly + * Use correct parameters for AC_INIT and AM_INIT_AUTOMAKE macros + * Rename configure.in into configure.ac + * New and updated translations +- removed lxmusic-0.4.4-libnotify0.7.0.patch + * fixed upstream +- spec file cleanup + +------------------------------------------------------------------- Old: ---- lxmusic-0.4.4-libnotify0.7.0.patch lxmusic-0.4.5.tar.gz New: ---- lxmusic-0.4.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxmusic.spec ++++++ --- /var/tmp/diff_new_pack.Bulxxv/_old 2014-09-08 21:30:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Bulxxv/_new 2014-09-08 21:30:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lxmusic # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,13 @@ Name: lxmusic -Version: 0.4.5 +Version: 0.4.6 Release: 0 Summary: Lightweight Audio Player License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://www.lxde.org/ -Source0: %name-%version.tar.gz -Patch2: %name-0.4.4-libnotify0.7.0.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: %{name}-%{version}.tar.xz BuildRequires: docbook-utils BuildRequires: fdupes BuildRequires: gtk2-devel @@ -35,54 +33,47 @@ BuildRequires: update-desktop-files BuildRequires: xmms2-devel >= 0.7 Requires: xmms2 -Recommends: %name-lang +Recommends: %{name}-lang +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description LXMusic is just a lightweight audio player, that uses xmms2 as back-end. %lang_package + %prep %setup -q -%if %suse_version > 1140 -%patch2 -p1 -%endif %build -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" %configure -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%makeinstall -# remove not available languages -%__rm -rf %{buildroot}/%{_datadir}/locale/{frp,es_VE,ur_PK} +make DESTDIR=%{buildroot} install %{?_smp_mflags} %find_lang %{name} -%suse_update_desktop_file %name +%suse_update_desktop_file %{name} %fdupes -s %{buildroot} -%clean -%__rm -rf $RPM_BUILD_ROOT - -%if 0%{?suse_version} >= 1140 - %post %desktop_database_post %postun %desktop_database_postun -%endif %files %defattr(-,root,root,0755) %doc COPYING -%_bindir/%name -%_datadir/applications/%name.desktop -%dir %_datadir/lxmusic -%_datadir/lxmusic/*.ui.glade -%_datadir/pixmaps/lxmusic.png +%{_bindir}/%{name} +%{_datadir}/applications/%{name}.desktop +%dir %{_datadir}/lxmusic +%{_datadir}/lxmusic/*.ui.glade +%{_datadir}/pixmaps/lxmusic.png +%{_mandir}/man1/lxmusic.1.gz -%files lang -f %name.lang +%files lang -f %{name}.lang +%defattr(-,root,root) %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-isns for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package yast2-isns for openSUSE:Factory checked in at 2014-09-08 21:29:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-isns (Old) and /work/SRC/openSUSE:Factory/.yast2-isns.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-isns" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-isns/yast2-isns.changes 2014-06-27 06:53:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-isns.new/yast2-isns.changes 2014-09-08 21:30:23.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Sep 4 13:39:48 UTC 2014 - cwh(a)suse.com + +- adapted to open-isns (bnc#887477 + fate#316901) by + - removing UI parts of things not supported by open-isns + - changing calls of 'isnsadm' to new syntax +- 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-isns-3.1.3.tar.bz2 New: ---- yast2-isns-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-isns.spec ++++++ --- /var/tmp/diff_new_pack.PtLYuu/_old 2014-09-08 21:30:25.000000000 +0200 +++ /var/tmp/diff_new_pack.PtLYuu/_new 2014-09-08 21:30:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-isns -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-isns-3.1.3.tar.bz2 -> yast2-isns-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-isns-3.1.3/package/yast2-isns.changes new/yast2-isns-3.1.4/package/yast2-isns.changes --- old/yast2-isns-3.1.3/package/yast2-isns.changes 2014-06-26 14:23:20.000000000 +0200 +++ new/yast2-isns-3.1.4/package/yast2-isns.changes 2014-09-08 12:08:24.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Sep 4 13:39:48 UTC 2014 - cwh(a)suse.com + +- adapted to open-isns (bnc#887477 + fate#316901) by + - removing UI parts of things not supported by open-isns + - changing calls of 'isnsadm' to new syntax +- 3.1.4 + +------------------------------------------------------------------- Thu Jun 5 11:23:03 CEST 2014 - gs(a)suse.de - correct name for firewall service, adjust 'isnsd' service start diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-isns-3.1.3/package/yast2-isns.spec new/yast2-isns-3.1.4/package/yast2-isns.spec --- old/yast2-isns-3.1.3/package/yast2-isns.spec 2014-06-26 14:23:20.000000000 +0200 +++ new/yast2-isns-3.1.4/package/yast2-isns.spec 2014-09-08 12:08:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-isns -Version: 3.1.3 +Version: 3.1.4 Release: 0 License: GPL-2.0 Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-isns-3.1.3/src/include/isns/dialogs.rb new/yast2-isns-3.1.4/src/include/isns/dialogs.rb --- old/yast2-isns-3.1.3/src/include/isns/dialogs.rb 2014-06-26 14:23:20.000000000 +0200 +++ new/yast2-isns-3.1.4/src/include/isns/dialogs.rb 2014-09-08 12:08:24.000000000 +0200 @@ -38,8 +38,6 @@ HStretch(), HSpacing(1), VBox( - "ipaddress", - VSpacing(2), "auto_start_up", VSpacing(2), "firewall", @@ -50,7 +48,7 @@ ), VStretch() ), - "widget_names" => ["ipaddress", "auto_start_up", "firewall"] + "widget_names" => ["auto_start_up", "firewall"] }, # second tab - iSCSI Nodes "members" => { @@ -71,16 +69,6 @@ HBox(HStretch(), VBox("dd_display_members"), HStretch()) ), "widget_names" => ["dd_display", "dd_display_members"] - }, - # fourth tab - discovery domain sets - "discoverydomainsets" => { - "header" => _("Discovery Domains Sets"), - "contents" => VBox( - HBox(HStretch(), VBox("dds_display"), HStretch()), - VStretch(), - HBox(HStretch(), VBox("dds_display_members"), HStretch()) - ), - "widget_names" => ["dds_display", "dds_display_members"] } } @@ -105,24 +93,6 @@ ) } ), - "ipaddress" => { - "widget" => :custom, - "custom_widget" => VBox( - HBox( - InputField( - Id(:isnsaddress), - Opt(:hstretch), - _("Address of iSNS Server") - ) - ) - ), - "init" => fun_ref(method(:initAddress), "void (string)"), - "handle" => fun_ref( - method(:handleAddress), - "symbol (string, map)" - ), - "help" => Ops.get_string(@HELPS, "ipaddress", "") - }, "firewall" => CWMFirewallInterfaces.CreateOpenFirewallWidget( { "services" => ["service:isns"], "display_details" => true } ), @@ -204,66 +174,6 @@ "symbol (string, map)" ), "help" => Ops.get_string(@HELPS, "dd_display_members", "") - }, - "dds_display" => { - "widget" => :custom, - "custom_widget" => VBox( - Heading(_("Discovery Domains Sets")), - HBox( - VSpacing(5), - Table( - Id(:dds_table), - Opt(:notify, :immediate), - Header(_("Discovery Domain Set Name")), - [] - ) - ), - Left( - HBox( - PushButton(Id(:add), _("Create Discovery Domain Set")), - PushButton(Id(:delete), _("Delete")), - HSpacing(25) - ) - ) - ), - "init" => fun_ref( - method(:initDiscoveryDomainSet), - "void (string)" - ), - "handle" => fun_ref( - method(:handleDiscoveryDomainSet), - "symbol (string, map)" - ), - "help" => Ops.get_string(@HELPS, "dds_display", "") - }, - "dds_display_members" => { - "widget" => :custom, - "custom_widget" => VBox( - Heading(_("Discovery Domain Set Members")), - HBox( - VSpacing(10), - Table( - Id(:dds_members_table), - Header(_("Discovery Domain Name")), - [] - ) - ), - Left( - HBox( - PushButton(Id(:adddd), _("Add Discovery Domain")), - PushButton(Id(:remove), _("Remove")) - ) - ) - ), - "init" => fun_ref( - method(:initDiscoveryDomainSetMembers), - "void (string)" - ), - "handle" => fun_ref( - method(:handleDiscoveryDomainSetMembers), - "symbol (string, map)" - ), - "help" => Ops.get_string(@HELPS, "dds_display_members", "") } } end @@ -280,8 +190,7 @@ "tab_order" => [ "service", "members", - "discoverydomains", - "discoverydomainsets" + "discoverydomains" ], "tabs" => @tabs_descr, "widget_descr" => @widgets, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-isns-3.1.3/src/include/isns/helps.rb new/yast2-isns-3.1.4/src/include/isns/helps.rb --- old/yast2-isns-3.1.3/src/include/isns/helps.rb 2014-06-26 14:23:20.000000000 +0200 +++ new/yast2-isns-3.1.4/src/include/isns/helps.rb 2014-09-08 12:08:24.000000000 +0200 @@ -36,9 +36,6 @@ "summary" => _( "<big>iSNS Configuration</big> \nConfigure an iSNS server. \n" ), - "ipaddress" => _( - "<big>iSNS Server location</big> The DNS name or the IP address of the iSNS service can be entered as the iSNS address.\n" - ), "iscsi_display" => _( "The list of all available iSCSI nodes registered with the iSNS service are displayed. Nodes are registered by iSCSI initiators and iSCSI targets. It is only possible to delete them. Deleting a node removes it from the iSNS database." ), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-isns-3.1.3/src/include/isns/widgets.rb new/yast2-isns-3.1.4/src/include/isns/widgets.rb --- old/yast2-isns-3.1.3/src/include/isns/widgets.rb 2014-06-26 14:23:20.000000000 +0200 +++ new/yast2-isns-3.1.4/src/include/isns/widgets.rb 2014-09-08 12:08:24.000000000 +0200 @@ -16,13 +16,10 @@ Yast.import "IsnsServer" Yast.import "String" Yast.import "Report" - - @address = "" end # **************** global funcions and variables ***** def DiscoveryDomainDetailDialog(values_before) - values_before = deep_copy(values_before) ret_map = {} dd_dialog = VBox( Heading(_("Create New Discovery Domain")), @@ -31,128 +28,33 @@ 3, InputField(Id(:ddentry), Opt(:hstretch), _("Discovery Domain Name")) ), - VSpacing(1), - HBox( - HSpacing(3), - VBox( - Label( - _( - "Select discovery domain set to which discovery domain will be added." - ) - ), - SelectionBox(Id(:ddsentries), _("Discovery Domain Name Set")) - ), - HSpacing(3) - ), - VSpacing(1), ButtonBox( - PushButton(Id(:ok), Label.OKButton), + PushButton(Id(:ok), Opt(:default), Label.OKButton), PushButton(Id(:cancel), Label.CancelButton) ), VSpacing(1) ) UI.OpenDialog(dd_dialog) - - inc_items = [] - count = 0 - index = "" - first = "" - Builtins.foreach(IsnsServer.readDDS(@address)) do |ddsentry| - if count == 0 - index = ddsentry - count = 1 - else - inc_items = Builtins.add(inc_items, Item(Id(index), ddsentry)) - count = 0 - first = ddsentry if first == "" - end - end - - UI.ChangeWidget(Id(:ddsentries), :Items, inc_items) - UI.ChangeWidget(Id(:ddsentries), :CurrentItem, first) + UI.SetFocus(:ddentry) ret = :nil while ret != :ok && ret != :cancel enable = false - ret = Convert.to_symbol(UI.UserInput) + ret = UI.UserInput end if ret == :cancel ret_map = {} else - dd_name = Convert.to_string(UI.QueryWidget(:ddentry, :Value)) - - dds_id = Convert.to_string( - UI.QueryWidget(Id(:ddsentries), :CurrentItem) - ) - Builtins.y2milestone("creating dd add to dds: %1", dds_id) - IsnsServer.addDD(@address, dd_name) - - count2 = 0 - dd_index = "" - Builtins.foreach(IsnsServer.readDD(@address)) do |dd| - if count2 == 0 - dd_index = dd - count2 = 1 - else - IsnsServer.addDDSMember(@address, dds_id, dd_index) if dd == dd_name - count2 = 0 - end - end - + dd_name = UI.QueryWidget(:ddentry, :Value) + IsnsServer.addDD(dd_name) ret_map = { "VALUE" => dd_name } end UI.CloseDialog - deep_copy(ret_map) + ret_map end - def DiscoveryDomainSetDetailDialog(values_before) - values_before = deep_copy(values_before) - ret_map = {} - dds_dialog = HBox( - HSpacing(5), - VBox( - VSpacing(1), - Left( - HWeight( - 3, - InputField( - Id(:ddsentry), - Opt(:hstretch), - _("Discovery Domain Set Name") - ) - ) - ), - Left( - ButtonBox( - PushButton(Id(:ok), Label.OKButton), - PushButton(Id(:cancel), Label.CancelButton) - ) - ), - VSpacing(1) - ), - HSpacing(5) - ) - UI.OpenDialog(dds_dialog) - - ret = :nil - while ret != :ok && ret != :cancel - enable = false - ret = Convert.to_symbol(UI.UserInput) - end - - if ret == :cancel - ret_map = {} - else - value = Convert.to_string(UI.QueryWidget(:ddsentry, :Value)) - ret_map = { "VALUE" => value } - end - UI.CloseDialog - deep_copy(ret_map) - end - - def CreateNode(values_before) - values_before = deep_copy(values_before) + def CreateNode() ret_map = {} node_dialog = HBox( HSpacing(5), @@ -230,7 +132,7 @@ 1, "" ) - IsnsServer.addDDMember(@address, dd_id, iqn) + IsnsServer.addDDMember(dd_id, iqn) initDiscoveryDomainPotentialISCSI(dd_id) end end @@ -239,82 +141,28 @@ deep_copy(ret_map) end - def DisplayAllDiscoveryDomainsDialog(dds_name, dds_id) - ret_map = {} - dds_dialog = VBox( - Heading(_("Add Discovery Domain to Set")), - Label(dds_name), - HSpacing(50), - Heading(_("Available Discovery Domains")), - HBox(VSpacing(10), Table(Id(:dd_table), Header(_("Name")), [])), - Left( - HBox( - PushButton(Id(:add), _("Add Discovery Domain")), - PushButton(Id(:exit), _("Done")) - ) - ) - ) - UI.OpenDialog(dds_dialog) - - initDiscoveryDomainPotential(dds_id) - - ret = :nil - while ret != :exit - enable = false - ret = Convert.to_symbol(UI.UserInput) - if ret == :add - Builtins.y2milestone("Add a dds member") - dd_id = Convert.to_string(UI.QueryWidget(Id(:dd_table), :CurrentItem)) - IsnsServer.addDDSMember(@address, dds_id, dd_id) - initDiscoveryDomainPotential(dds_id) - end - end - - UI.CloseDialog - deep_copy(ret_map) - end - - - def initAddress(key) - @address = Ops.get_string( - Convert.convert( - SCR.Execute( - path(".target.bash_output"), - "cat /etc/isns.conf|cut -d'=' -f2|tr -d '\n'" - ), - :from => "any", - :to => "map <string, any>" - ), - "stdout", - "" - ) - UI.ChangeWidget(:isnsaddress, :Value, @address) - - nil - end def initISCSI(key) - count = 0 type = _("Target or Initiator") inc_items = [] checkISNS - Builtins.foreach(IsnsServer.readISCSI(@address)) do |key2| - inc_items = Builtins.add( - inc_items, - Item( - Id(count), - Ops.get_string(key2, "NODE", ""), - Ops.get_string(key2, "TYPE", "") - ) - ) - count = Ops.add(count, 1) + list = IsnsServer.readISCSI + + list.each_with_index do |key, index| + inc_items.push(Item( + Id(index), + key["NODE"], + key["TYPE"] + ) + ) end UI.ChangeWidget(Id(:members_table), :Items, inc_items) nil end + def initDiscoveryDomainPotentialISCSI(key) count = 0 type = _("Target or Initiator") @@ -323,9 +171,9 @@ ddmembers = [] found = "FALSE" - ddmembers = IsnsServer.readDDMembers(@address, key) + ddmembers = IsnsServer.readDDMembers(key) - Builtins.foreach(IsnsServer.readISCSI(@address)) do |iscsinode2| + Builtins.foreach(IsnsServer.readISCSI) do |iscsinode2| found = "FALSE" Builtins.foreach(ddmembers) do |ddmember| if Ops.get_string(ddmember, "NODE", "") == @@ -351,79 +199,32 @@ nil end def initDDISCSIMembers(key) - count = 0 - index = "" - ddid = "" inc_items = [] Builtins.y2milestone("initDDISCSIMembers key is:%1", key) if key == "dd_display_members" - key = Convert.to_string(UI.QueryWidget(Id(:dd_table), :CurrentItem)) + key = UI.QueryWidget(Id(:dd_table), :CurrentItem) end ddid = key - Builtins.foreach(IsnsServer.readDDMembers(@address, ddid)) do |result| + IsnsServer.readDDMembers(ddid).each_with_index do |result, index| Builtins.y2milestone("iscsiMembers: %1", key) - inc_items = Builtins.add( - inc_items, - Item( - Id(count), - Ops.get_string(result, "NODE", ""), - Ops.get_string(result, "TYPE", "") - ) - ) - count = Ops.add(count, 1) + inc_items << Item(Id(index), result["NODE"], result["TYPE"]) end UI.ChangeWidget(Id(:dd_members_table), :Items, inc_items) nil end - def initDiscoveryDomain(key) - count = 0 - index = "" - inc_items = [] + def initDiscoveryDomain(key = nil) checkISNS - Builtins.foreach(IsnsServer.readDD(@address)) do |dd| - if count == 0 - index = dd - count = 1 - else - inc_items = Builtins.add(inc_items, Item(Id(index), dd)) - count = 0 - end - end - - UI.ChangeWidget(Id(:dd_table), :Items, inc_items) - - nil - end - def initDiscoveryDomainPotential(key) - count = 0 - index = "" inc_items = [] - ddsmembers = [] - found = "FALSE" - - ddsmembers = IsnsServer.readDDSMembers(@address, key) - - Builtins.foreach(IsnsServer.readDD(@address)) do |dd| - if count == 0 - index = dd - count = 1 - else - found = "FALSE" - Builtins.foreach(ddsmembers) do |ddsmember| - found = "TRUE" if ddsmember == dd - end - if found == "FALSE" - inc_items = Builtins.add(inc_items, Item(Id(index), dd)) - end - count = 0 - end + IsnsServer.readDD.each do |dd| + dd["DD name"] = "default" if dd["DD ID"] == "0" + inc_items << Item(Id(dd["DD ID"]), dd["DD name"]) end UI.ChangeWidget(Id(:dd_table), :Items, inc_items) @@ -431,87 +232,15 @@ nil end - def initDiscoveryDomainSet(key) - count = 0 - index = "" - - inc_items = [] - - Builtins.y2milestone("isnsaddress is %1", @address) - - checkISNS - - Builtins.foreach(IsnsServer.readDDS(@address)) do |key2| - if count == 0 - index = key2 - count = 1 - else - inc_items = Builtins.add(inc_items, Item(Id(index), key2)) - count = 0 - end - end - - UI.ChangeWidget(Id(:dds_table), :Items, inc_items) - - nil - end - def initDiscoveryDomainSetMembers(key) - count = 0 - index = "" - inc_items = [] - dds_id = "" - - if key == "dds_display_members" - key = Convert.to_string(UI.QueryWidget(Id(:dds_table), :CurrentItem)) - end - - dds_id = key - - Builtins.foreach(IsnsServer.readDDSMembers(@address, dds_id)) do |key2| - Builtins.y2milestone("results received: %1", key2) - if count == 0 - index = key2 - count = 1 - else - inc_items = Builtins.add(inc_items, Item(Id(index), key2)) - count = 0 - end - end - - UI.ChangeWidget(Id(:dds_members_table), :Items, inc_items) - - nil - end - - - def handleAddress(key, event) - event = deep_copy(event) - @address = Convert.to_string(UI.QueryWidget(:isnsaddress, :Value)) - SCR.Execute( - path(".target.bash_output"), - Builtins.sformat("echo \"isns_address=%1\">/etc/isns.conf", @address) - ) - Builtins.y2milestone("isnsaddress is %1", @address) - nil - end - - def handleISCSI(key, event) - event = deep_copy(event) - if Ops.get_string(event, "EventReason", "") == "Activated" - case Ops.get_symbol(event, "WidgetID") + if event["EventReason"] == "Activated" + case event["WidgetID"] when :delete @del = UI.QueryWidget(Id(:members_table), :CurrentItem) if @del != nil if Popup.ContinueCancel(_("Really delete the selected item?")) - discoverydomainsetname = Ops.get_string( - Convert.to_term( - UI.QueryWidget(Id(:members_table), term(:Item, @del)) - ), - 1, - "" - ) - IsnsServer.deleteISCSI(@address, discoverydomainsetname) + iqn = UI.QueryWidget(Id(:members_table), term(:Item, @del))[1] + IsnsServer.deleteISCSI(iqn) initISCSI("") else Builtins.y2milestone("Delete canceled") @@ -539,63 +268,15 @@ ) if @del != nil if Popup.ContinueCancel(_("Really delete this domain?")) - IsnsServer.deleteDD(@address, @del) - initDiscoveryDomain("") + IsnsServer.deleteDD(@del) + initDiscoveryDomain else Builtins.y2milestone("Delete canceled") end end when :add @add_map = DiscoveryDomainDetailDialog({ "VALUE" => "" }) - if @add_map != {} - # IsnsServer::addDD(address, add_map["VALUE"]:""); - initDiscoveryDomain("") - end - end - end - - nil - end - - def handleDiscoveryDomainSet(key, event) - event = deep_copy(event) - mycurrent = Convert.to_string( - UI.QueryWidget(Id(:dds_table), :CurrentItem) - ) - Builtins.y2milestone( - "handleDiscoveryDomainSet action called: %1 -- %2 -- %3", - key, - event, - mycurrent - ) - - if Ops.get_string(event, "EventReason", "") == "SelectionChanged" - Builtins.y2milestone("selectionChangedEvent") - dds_id = Convert.to_string(UI.QueryWidget(Id(:dds_table), :CurrentItem)) - Builtins.y2milestone("selectionChangedEvent - dds-id:%1", dds_id) - initDiscoveryDomainSetMembers(dds_id) - end - - if Ops.get_string(event, "EventReason", "") == "Activated" - case Ops.get_symbol(event, "WidgetID") - when :delete - @del = Convert.to_string( - UI.QueryWidget(Id(:dds_table), :CurrentItem) - ) - if @del != nil - if Popup.ContinueCancel(_("Really delete the selected item?")) - IsnsServer.deleteDDS(@address, @del) - initDiscoveryDomainSet("") - else - Builtins.y2milestone("Delete canceled") - end - end - when :add - @add_map = DiscoveryDomainSetDetailDialog({ "VALUE" => "" }) - if @add_map != {} - IsnsServer.addDDS(@address, Ops.get_string(@add_map, "VALUE", "")) - initDiscoveryDomainSet("") - end + initDiscoveryDomain unless @add_map.empty? end end @@ -624,7 +305,7 @@ dd_id = Convert.to_string( UI.QueryWidget(Id(:dd_table), :CurrentItem) ) - IsnsServer.deleteDDMember(@address, dd_id, dd_name) + IsnsServer.deleteDDMember(dd_id, dd_name) initDDISCSIMembers(dd_id) when :addiscsinode dd_id = Convert.to_string( @@ -647,12 +328,11 @@ "" ) - add_map = CreateNode({ "VALUE" => "" }) + add_map = CreateNode() if add_map != {} IsnsServer.addDDMember( - @address, dd_id, - Ops.get_string(add_map, "VALUE", "") + add_map["VALUE"] ) end @@ -663,52 +343,12 @@ nil end - def handleDiscoveryDomainSetMembers(key, event) - event = deep_copy(event) - if Ops.get_string(event, "EventReason", "") == "Activated" - case Ops.get_symbol(event, "WidgetID") - when :delete - # domain Set deleted, but we get this event so update the members table - dds_id = Convert.to_string( - UI.QueryWidget(Id(:dds_table), :CurrentItem) - ) - initDiscoveryDomainSetMembers(dds_id) - when :remove - Builtins.y2milestone("Unassign a dds member") - dds_id = Convert.to_string( - UI.QueryWidget(Id(:dds_table), :CurrentItem) - ) - dd_id = Convert.to_string( - UI.QueryWidget(Id(:dds_members_table), :CurrentItem) - ) - IsnsServer.deleteDDSMember(@address, dds_id, dd_id) - initDiscoveryDomainSetMembers(dds_id) - when :adddd - Builtins.y2milestone("Add a dds member") - dds_id = Convert.to_string( - UI.QueryWidget(Id(:dds_table), :CurrentItem) - ) - dds_name = Ops.get_string( - Convert.to_term( - UI.QueryWidget(Id(:dds_table), term(:Item, dds_id)) - ), - 1, - "" - ) - add_map1 = DisplayAllDiscoveryDomainsDialog(dds_name, dds_id) - initDiscoveryDomainSetMembers(dds_id) - end - end - - nil - end def checkISNS - isns_status = IsnsServer.testISNSAccess(@address) - if isns_status != "OK" + if !IsnsServer.testISNSAccess # boolean display = true; # Report::DisplayErrors(display,10); Report.Error( - _("Unable to connect to iSNS server. Check iSNS server address.") + _("Unable to connect to iSNS server. Check if iSNS server is running.") ) return 1 end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-isns-3.1.3/src/modules/IsnsServer.rb new/yast2-isns-3.1.4/src/modules/IsnsServer.rb --- old/yast2-isns-3.1.3/src/modules/IsnsServer.rb 2014-06-26 14:23:20.000000000 +0200 +++ new/yast2-isns-3.1.4/src/modules/IsnsServer.rb 2014-09-08 12:08:24.000000000 +0200 @@ -13,10 +13,10 @@ module Yast class IsnsServerClass < Module + def main textdomain "isns" - Yast.import "Progress" Yast.import "Report" Yast.import "Summary" Yast.import "Message" @@ -124,7 +124,7 @@ # Data was modified? # @return true if modified def Modified - Builtins.y2debug("modified=%1", @modified) + y2debug("modified=%1", @modified) @modified end @@ -136,37 +136,14 @@ :to => "map <string, any>" ) # IsnsServerFunctions::parseConfig( read_values ); - Builtins.y2milestone("isns readConfig") + y2milestone("isns readConfig") true end - # write configuration file /etc/ietd.conf - def writeConfig - # prepare map, because perl->ycp lost information about data types (integers in this case) - # map <string, any> config_file = IsnsServerFunctions::writeConfig(); - # config_file["type"]=tointeger(config_file["type"]:"1"); - # config_file["file"]=tointeger(config_file["file"]:"1"); - # list <map<string, any> > value = []; - # foreach(map<string, any> row, config_file["value"]:[], { - # row["type"]=tointeger(row["type"]:"1"); - # row["file"]=tointeger(row["file"]:"1"); - # value = add(value, row); - # }); - # - # config_file["value"] = value; - # y2milestone("config_file to write %1", config_file); - # // write it - # SCR::Write(.etc.ietd.all, config_file); - # SCR::Write(.etc.ietd, nil); - true - end - - - # test if required package ("open-isns") is installed def installed_packages ret = false - Builtins.y2milestone("Check if open-isns is installed") + y2milestone("Check if open-isns is installed") if !Package.InstallMsg( "open-isns", _( @@ -205,7 +182,7 @@ @statusOnStart = true @serviceStatus = true end - Builtins.y2milestone("Service status = %1", @statusOnStart) + y2milestone("Service status = %1", @statusOnStart) isnsdSocketStart if !@statusOnStart ret end @@ -216,11 +193,11 @@ start = @statusOnStart if !@serviceStatus if !start - Builtins.y2milestone("Stop isnsd service and socket") + y2milestone("Stop isnsd service and socket") isnsdSocketStop Service.Stop("isnsd") else - Builtins.y2milestone("Start isnsd socket") + y2milestone("Start isnsd socket") Service.Stop("isnsd") if Service.Status("isnsd") == 0 @serviceStatus = true isnsdSocketStart @@ -228,417 +205,89 @@ true end - def testISNSAccess(address) - value = "OK" - temp = {} - - command = Builtins.sformat("isnsadm -a %1 -t -q iscsi", address) - result = Convert.convert( - SCR.Execute(path(".target.bash_output"), command, {}), - :from => "any", - :to => "map <string, any>" - ) - Builtins.foreach( - Builtins.splitstring(Ops.get_string(result, "stdout", ""), "\n") - ) do |row| - if row == "TCP error on connection" - Builtins.y2milestone("TCP error: %1 ", row) - value = "ERROR" - end - if row == "Error Sending TCP request." - Builtins.y2milestone("Failed to resolve host error: %1 ", row) - value = "ERROR" - end - end - - value - end - def readISCSI(address) - values = [] - temp = {} - - command = Builtins.sformat("isnsadm -a %1 -t -q iscsi", address) - result = Convert.convert( - SCR.Execute(path(".target.bash_output"), command, {}), - :from => "any", - :to => "map <string, any>" - ) - Builtins.foreach( - Builtins.splitstring(Ops.get_string(result, "stdout", ""), "\n") - ) do |row| - pos = Builtins.findfirstof(row, ":") - key = "" - val = "" - if pos != nil && Ops.greater_than(pos, 0) - key = Builtins.substring(row, 0, pos) - end - if key == "iSCSI ID " - val = Builtins.substring(row, Ops.add(pos, 2)) - Ops.set(temp, "NODE", val) - end - if key == "Type" - val = Builtins.substring(row, Ops.add(pos, 6)) - Ops.set(temp, "TYPE", val) - values = Builtins.add(values, temp) - end - end - - deep_copy(values) - end - - def readISCSI_type(address, index) - temp = "" - - Builtins.y2milestone("iSCSIRead_type index:%1", index) - - command = Builtins.sformat( - "isnsadm -a %1 -t -q iscsi -n %2", - address, - index - ) - result = Convert.convert( - SCR.Execute(path(".target.bash_output"), command, {}), - :from => "any", - :to => "map <string, any>" - ) - Builtins.foreach( - Builtins.splitstring(Ops.get_string(result, "stdout", ""), "\n") - ) do |row| - pos = Builtins.findfirstof(row, ":") - key = "" - val = "" - if pos != nil && Ops.greater_than(pos, 0) - key = Builtins.substring(row, 0, pos) - val = Builtins.substring(row, Ops.add(pos, 6)) - end - Builtins.y2milestone("iSCSIRead_type %1", key) - if key == "Type" - Builtins.y2milestone("iSCSIRead_type return value is %1", val) - temp = val - end - end - - temp + def testISNSAccess() + # We cannot proceed if we are not control node + isnsadm_control end - - def readDDS(address) + def readISCSI values = [] - ddid = "" - Builtins.y2milestone("readDDS %1", address) - command = Builtins.sformat("isnsadm -a %1 -t -q dds", address) - result = Convert.convert( - SCR.Execute(path(".target.bash_output"), command, {}), - :from => "any", - :to => "map <string, any>" - ) - Builtins.foreach( - Builtins.splitstring(Ops.get_string(result, "stdout", ""), "\n") - ) do |row| - pos = Builtins.findfirstof(row, ":") - key = "" - val = "" - if pos != nil && Ops.greater_than(pos, 0) - key = Builtins.substring(row, 0, pos) - val = Builtins.substring(row, Ops.add(pos, 2)) - end - if key == "DDS ID " - values = Builtins.add(values, val) - elsif key == "DDS Sym Name " - values = Builtins.add(values, val) - end + isnsadm_list("nodes").each do |obj| + temp = {} + temp["NODE"] = obj["iSCSI name"] + temp["TYPE"] = obj["iSCSI node type"] + values.push(temp) end - deep_copy(values) + values end - def readDDMembers(address, id) + def readDDMembers(id) values = [] temp = {} - ddid = "" - Builtins.y2milestone("readDDSMembers %1 %2", address, id) - command = Builtins.sformat("isnsadm -a %1 -t -q dd -n %2", address, id) - result = Convert.convert( - SCR.Execute(path(".target.bash_output"), command, {}), - :from => "any", - :to => "map <string, any>" - ) - Builtins.foreach( - Builtins.splitstring(Ops.get_string(result, "stdout", ""), "\n") - ) do |row| - pos = Builtins.findfirstof(row, ":") - key = "" - val = "" - Builtins.y2milestone("results: %1", row) - if pos != nil && Ops.greater_than(pos, 0) - key = Builtins.substring(row, 0, pos) - val = Builtins.substring(row, Ops.add(pos, 2)) - end - Ops.set(temp, "NODE", val) if key == " DD iSCSI Member " - if key == " DD iSCSI Member Index " - Ops.set(temp, "TYPE", readISCSI_type(address, val)) - values = Builtins.add(values, temp) - end - end + y2milestone("readDDMembers of DD #{id}") - deep_copy(values) - end - - def readDDSMembers(address, id) - values = [] - ddid = "" + ddmembers = isnsadm_query("dd-id=#{id}")["DD member iSCSI name"] + return [] unless ddmembers - Builtins.y2milestone("readDDSMembers %1 %2", address, id) - command = Builtins.sformat("isnsadm -a %1 -t -q dds -n %2", address, id) - result = Convert.convert( - SCR.Execute(path(".target.bash_output"), command, {}), - :from => "any", - :to => "map <string, any>" - ) - Builtins.foreach( - Builtins.splitstring(Ops.get_string(result, "stdout", ""), "\n") - ) do |row| - pos = Builtins.findfirstof(row, ":") - key = "" - val = "" - Builtins.y2milestone("results: %1", row) - if pos != nil && Ops.greater_than(pos, 0) - key = Builtins.substring(row, 0, pos) - val = Builtins.substring(row, Ops.add(pos, 2)) - end - if key == " DD ID " - values = Builtins.add(values, val) - elsif key == " DD Sym Name " - values = Builtins.add(values, val) - end + ddmembers.each do |iqn| + type = isnsadm_query("iscsi-name=#{iqn}")["iSCSI node type"] + values << {"NODE" => iqn, "TYPE" => type } end - deep_copy(values) + values end - def readDD(address) - values = [] - ddid = "" - - Builtins.y2milestone("readDD") - command = Builtins.sformat("isnsadm -a %1 -t -q dd", address) - result = Convert.convert( - SCR.Execute(path(".target.bash_output"), command, {}), - :from => "any", - :to => "map <string, any>" - ) - Builtins.foreach( - Builtins.splitstring(Ops.get_string(result, "stdout", ""), "\n") - ) do |row| - pos = Builtins.findfirstof(row, ":") - key = "" - val = "" - if pos != nil && Ops.greater_than(pos, 0) - key = Builtins.substring(row, 0, pos) - val = Builtins.substring(row, Ops.add(pos, 2)) - end - if key == "DD ID " - values = Builtins.add(values, val) - elsif key == "DD Sym Name " - values = Builtins.add(values, val) - end - end - - deep_copy(values) + def readDD + y2milestone("readDD") + isnsadm_list("dds") end - def addISCSI(address, name, entityid) - Builtins.y2milestone("addISCSI") - command = Builtins.sformat( - "isnsadm -a %1 -t -r iscsi -n '%2' -m '%3'", - address, - name, - entityid - ) - SCR.Execute(path(".target.bash_output"), command, {}) - true + def addDDMember(dd_id, iqn) + y2milestone("addDDMember #{iqn} to #{dd_id}") + isnsadm("--dd-register dd-id=#{dd_id} dd-member-name=#{iqn}") end - def addDDS(address, name) - Builtins.y2milestone("addDDS") - command = Builtins.sformat( - "isnsadm -a %1 -t -r dds -n '%2'", - address, - name - ) - SCR.Execute(path(".target.bash_output"), command, {}) - true + def addDD(iqn) + y2milestone("addDD #{iqn}") + isnsadm("--dd-register dd-name=#{iqn}") end - def addDDMember(address, dd_id, iqn) - Builtins.y2milestone("addDDMember") - command = Builtins.sformat( - "isnsadm -a %1 -t -r ddmember -n %2 -m %3", - address, - dd_id, - iqn - ) - SCR.Execute(path(".target.bash_output"), command, {}) - true - end - - def addDDSMember(address, dds_id, dd_id) - Builtins.y2milestone("addDDSMember") - command = Builtins.sformat( - "isnsadm -a %1 -t -r ddsmember -n %2 -m %3", - address, - dds_id, - dd_id - ) - SCR.Execute(path(".target.bash_output"), command, {}) - true + def deleteISCSI(id) + y2milestone("deleteISCSI: #{id}") + isnsadm("--deregister iscsi-name=#{id}") end - def addDD(address, name) - Builtins.y2milestone("addDD") - command = Builtins.sformat( - "isnsadm -a %1 -t -r dd -n '%2'", - address, - name - ) - SCR.Execute(path(".target.bash_output"), command, {}) - true + def deleteDDMember(dd_id, iqn) + y2milestone("deleteDDMember #{iqn} from #{dd_id}") + isnsadm("--dd-deregister #{dd_id} dd-member-name=#{iqn}") end - def deleteISCSI(address, id) - Builtins.y2milestone("deleteISCSI") - command = Builtins.sformat( - "isnsadm -a %1 -t -d iscsi -n '%2'", - address, - id - ) - SCR.Execute(path(".target.bash_output"), command, {}) - - true - end - - def deleteDDS(address, id) - Builtins.y2milestone("deleteDDS") - command = Builtins.sformat("isnsadm -a %1 -t -d dds -n '%2'", address, id) - SCR.Execute(path(".target.bash_output"), command, {}) - - true - end - - def deleteDDMember(address, dd_id, iqn) - Builtins.y2milestone("deleteDDSMember:%1", iqn) - command = Builtins.sformat( - "isnsadm -a %1 -t -d ddmember -n %2 -m %3", - address, - dd_id, - iqn - ) - SCR.Execute(path(".target.bash_output"), command, {}) - - true + def deleteDD(id) + y2milestone("deleteDD: #{id}") + isnsadm("--dd-deregister #{id}") end - def deleteDDSMember(address, dds_id, dd_id) - Builtins.y2milestone("deleteDDSMember") - command = Builtins.sformat( - "isnsadm -a %1 -t -d ddsmember -n %2 -m %3", - address, - dds_id, - dd_id - ) - SCR.Execute(path(".target.bash_output"), command, {}) - - true - end - - def deleteDD(address, id) - Builtins.y2milestone("deleteDDS") - command = Builtins.sformat("isnsadm -a %1 -t -d dd -n '%2'", address, id) - SCR.Execute(path(".target.bash_output"), command, {}) - - true - end - - # Read all iscsi-server settings # @return true on success def Read # IsnsServer read dialog caption caption = _("Initializing isns daemon configuration") - # TODO FIXME Set the right number of stages - steps = 4 - - sl = 500 - Builtins.sleep(sl) - - # TODO FIXME Names of real stages - # We do not set help text here, because it was set outside - Progress.New( - caption, - " ", - steps, - [ - # Progress stage 1/3 - _("Read the database"), - # Progress stage 2/3 - _("Read the previous settings"), - # Progress stage 3/3 - _("Detect the devices") - ], - [ - # Progress step 1/3 - _("Reading the database..."), - # Progress step 2/3 - _("Reading the previous settings..."), - # Progress step 3/3 - _("Detecting the devices..."), - # Progress finished - _("Finished") - ], - "" - ) - # check if user is root return false if !Confirm.MustBeRoot - Progress.NextStage + # check if required packages ("open-isns") is installed return false if !installed_packages - Builtins.sleep(sl) - return false if Abort() - Progress.NextStep # get status of isns init script return false if !getServiceStatus - Builtins.sleep(sl) - - return false if Abort() - Progress.NextStage - # read configuration (/etc/ietd.conf) - if !readConfig - Report.Error(Message.CannotReadCurrentSettings) - return false - end - Builtins.sleep(sl) # detect devices - Progress.set(false) SuSEFirewall.Read - Progress.set(true) - - Progress.NextStage - # Error message - return false if false - Builtins.sleep(sl) - - return false if Abort() - # Progress finished - Progress.NextStage - Builtins.sleep(sl) - return false if Abort() @modified = false @configured = true true @@ -650,56 +299,7 @@ # IsnsServer write dialog caption caption = _("Saving isns Configuration") - # TODO FIXME And set the right number of stages - steps = 2 - - sl = 500 - Builtins.sleep(sl) - - # TODO FIXME Names of real stages - # We do not set help text here, because it was set outside - Progress.New( - caption, - " ", - steps, - [ - # Progress stage 1/2 - _("Write the settings"), - # Progress stage 2/2 - _("Run SuSEconfig") - ], - [ - # Progress step 1/2 - _("Writing the settings..."), - # Progress step 2/2 - _("Running SuSEconfig..."), - # Progress finished - _("Finished") - ], - "" - ) - - - Progress.set(false) SuSEFirewall.Write - Progress.set(true) - - Progress.NextStage - # write configuration (/etc/isns.conf) - Report.Error(_("Cannot write settings.")) if !writeConfig - Builtins.sleep(sl) - - - return false if Abort() - Progress.NextStage - # ask user whether reload or restart server and do it - # if ( (serviceStatus) || (statusOnStart) ) - # if (!reloadServer()) return false; - # sleep(sl); - - return false if Abort() - Progress.NextStage - Builtins.sleep(sl) # set isns initscript status return false if !setServiceStatus @@ -719,12 +319,12 @@ # get/set service accessors for CWMService component def GetStartService status = isnsdSocketEnabled? - Builtins.y2milestone("isns service status %1", status) + y2milestone("isns service status %1", status) status end def SetStartService(status) - Builtins.y2milestone("Set service status %1", status) + y2milestone("Set service status %1", status) @serviceStatus = status if status == true isnsdSocketEnable @@ -735,6 +335,87 @@ nil end + private + + def isnsadm(params, ret_result = false) + command = "isnsadm --local #{params}" + y2debug("Executing #{command}") + res = SCR.Execute(path(".target.bash_output"), command, {}) + + if ret_result + return res + else + return res["exit"] == 0 + end + end + + def isnsadm_control + if !@isctrlnode + @isctrlnode = isnsadm("--register control") + if !@isctrlnode + y2error("Registering as control node failed: #{res["stderr"]}; #{res["stdout"]}") + end + end + + @isctrlnode + end + + def isnsadm_query(query) + if !isnsadm_control + y2error("We aren't control node. Only default DD shown.") + end + + stdout = isnsadm("--query #{query}", true)["stdout"] + + parse_obj(stdout) + end + + def isnsadm_list(type) + if !isnsadm_control + y2error("We aren't control node. Only default DD shown.") + end + + objects = isnsadm("--list #{type}", true)["stdout"].split(/Object \d+:\n/) + + temp = [] + objects.each do |obj| + next if obj.empty? + temp << parse_obj(obj) + end + temp + end + + def parse_obj(text) + obj_details = {} + + text.each_line do |line| + line.chomp! + + # Schema of each line is: + # <definition> : <key> = <value> + # e.g.: + # 0020 string : iSCSI name = "iqn.2005-01.org.open-iscsi.foo:disk1" + # ( m[1] ) ( m[2] ) ( m[3] ) + # + # Quotation marks around the value(if any) are stripped. + # In some cases (dds) keys are not unique. + + line.match(/^\s*(.*)\b\s*:\s*(.*)\b\s*=\s*"*([^"]*)"*\s*$/) do |m| + key = m[2] + value = m[3] + + if key == "DD member iSCSI index" || key == "DD member iSCSI name" + obj_details[key] ||= [] + obj_details[key] << value + else + obj_details[key] = value + end + end + end + + obj_details + end + publish :function => :Modified, :type => "boolean ()" publish :variable => :modified, :type => "boolean" publish :variable => :configured, :type => "boolean" @@ -743,22 +424,14 @@ publish :variable => :AbortFunction, :type => "boolean ()" publish :function => :Abort, :type => "boolean ()" publish :function => :readConfig, :type => "boolean ()" - publish :function => :testISNSAccess, :type => "string (string)" + publish :function => :testISNSAccess, :type => "boolean ()" publish :function => :readISCSI, :type => "list <map <string, any>> (string)" - publish :function => :readISCSI_type, :type => "string (string, string)" - publish :function => :readDDS, :type => "list <string> (string)" publish :function => :readDDMembers, :type => "list <map <string, any>> (string, string)" - publish :function => :readDDSMembers, :type => "list <string> (string, string)" publish :function => :readDD, :type => "list <string> (string)" - publish :function => :addISCSI, :type => "boolean (string, string, string)" - publish :function => :addDDS, :type => "boolean (string, string)" publish :function => :addDDMember, :type => "boolean (string, string, string)" - publish :function => :addDDSMember, :type => "boolean (string, string, string)" publish :function => :addDD, :type => "boolean (string, string)" publish :function => :deleteISCSI, :type => "boolean (string, string)" - publish :function => :deleteDDS, :type => "boolean (string, string)" publish :function => :deleteDDMember, :type => "boolean (string, string, string)" - publish :function => :deleteDDSMember, :type => "boolean (string, string, string)" publish :function => :deleteDD, :type => "boolean (string, string)" publish :function => :Read, :type => "boolean ()" publish :function => :Write, :type => "boolean ()" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hiawatha for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package hiawatha for openSUSE:Factory checked in at 2014-09-08 21:29:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hiawatha (Old) and /work/SRC/openSUSE:Factory/.hiawatha.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hiawatha" Changes: -------- --- /work/SRC/openSUSE:Factory/hiawatha/hiawatha.changes 2014-06-10 14:38:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hiawatha.new/hiawatha.changes 2014-09-08 21:30:22.000000000 +0200 @@ -1,0 +2,15 @@ +Sun Sep 7 23:29:36 UTC 2014 - fisiu(a)opensuse.org + +- Update to 9.7: + * UseToolkit now possible in .hiawatha file at root of website. + * Method option added to URL Toolkit. + * SetResourceLimit option added. + * ThreadKillRate option added. + * Improved SQL injection detection. + * Default value for DHsize set to 2048. + * PolarSSL updated to version 1.3.8. + * Memory allocation debugger module added. + * Small bugfixes and improvements. + * Bugfix: incorrect file hash printing by wigwam with directory as symlink. + +------------------------------------------------------------------- Old: ---- hiawatha-9.6.tar.gz New: ---- hiawatha-9.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hiawatha.spec ++++++ --- /var/tmp/diff_new_pack.n8Zi29/_old 2014-09-08 21:30:23.000000000 +0200 +++ /var/tmp/diff_new_pack.n8Zi29/_new 2014-09-08 21:30:23.000000000 +0200 @@ -20,7 +20,7 @@ %define webroot /srv/www Name: hiawatha -Version: 9.6 +Version: 9.7 Release: 0 Summary: A secure and advanced webserver License: GPL-2.0 ++++++ hiawatha-9.6.tar.gz -> hiawatha-9.7.tar.gz ++++++ ++++ 24429 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 perl-POSIX-strftime-Compiler for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package perl-POSIX-strftime-Compiler for openSUSE:Factory checked in at 2014-09-08 21:29:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-POSIX-strftime-Compiler (Old) and /work/SRC/openSUSE:Factory/.perl-POSIX-strftime-Compiler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-POSIX-strftime-Compiler" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-POSIX-strftime-Compiler/perl-POSIX-strftime-Compiler.changes 2014-03-09 18:42:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-POSIX-strftime-Compiler.new/perl-POSIX-strftime-Compiler.changes 2014-09-08 21:30:21.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Sep 8 08:37:20 UTC 2014 - coolo(a)suse.com + +- updated to 0.40 + - fix test. accept ACST as Australia/Darwin's timezone + Because Australian eastern time zone abbr changed in tzdata 2014f + ref http://mm.icann.org/pipermail/tz-announce/2014-August/000023.html + + 0.32 2014-06-09T01:53:19Z + + - change perl version requirements to 5.8.1 + +------------------------------------------------------------------- Old: ---- POSIX-strftime-Compiler-0.31.tar.gz New: ---- POSIX-strftime-Compiler-0.40.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-POSIX-strftime-Compiler.spec ++++++ --- /var/tmp/diff_new_pack.FBE0Se/_old 2014-09-08 21:30:21.000000000 +0200 +++ /var/tmp/diff_new_pack.FBE0Se/_new 2014-09-08 21:30:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-POSIX-strftime-Compiler -Version: 0.31 +Version: 0.40 Release: 0 %define cpan_name POSIX-strftime-Compiler Summary: GNU C library compatible strftime for loggers and servers ++++++ POSIX-strftime-Compiler-0.31.tar.gz -> POSIX-strftime-Compiler-0.40.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/POSIX-strftime-Compiler-0.31/Build.PL new/POSIX-strftime-Compiler-0.40/Build.PL --- old/POSIX-strftime-Compiler-0.31/Build.PL 2014-02-24 07:27:15.000000000 +0100 +++ new/POSIX-strftime-Compiler-0.40/Build.PL 2014-08-21 03:25:57.000000000 +0200 @@ -34,7 +34,7 @@ test_files => ((-d '.git' || $ENV{RELEASE_TESTING}) && -d 'xt') ? 't/ xt/' : 't/', recursive_test_files => 1, - + ); if (-d 'share') { $args{share_dir} = 'share'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/POSIX-strftime-Compiler-0.31/Changes new/POSIX-strftime-Compiler-0.40/Changes --- old/POSIX-strftime-Compiler-0.31/Changes 2014-02-24 07:27:15.000000000 +0100 +++ new/POSIX-strftime-Compiler-0.40/Changes 2014-08-21 03:25:57.000000000 +0200 @@ -1,5 +1,15 @@ Revision history for Perl extension POSIX-strftime-Compiler +0.40 2014-08-21T01:25:32Z + + - fix test. accept ACST as Australia/Darwin's timezone + Because Australian eastern time zone abbr changed in tzdata 2014f + ref http://mm.icann.org/pipermail/tz-announce/2014-August/000023.html + +0.32 2014-06-09T01:53:19Z + + - change perl version requirements to 5.8.1 + 0.31 2014-02-24T06:27:11Z - bugfix on solaris. Solaris does not have %s. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/POSIX-strftime-Compiler-0.31/META.json new/POSIX-strftime-Compiler-0.40/META.json --- old/POSIX-strftime-Compiler-0.31/META.json 2014-02-24 07:27:15.000000000 +0100 +++ new/POSIX-strftime-Compiler-0.40/META.json 2014-08-21 03:25:57.000000000 +0200 @@ -4,7 +4,7 @@ "Masahiro Nagano <kazeburo(a)gmail.com>" ], "dynamic_config" : 0, - "generated_by" : "Minilla/v0.11.0", + "generated_by" : "Minilla/v1.1.0", "license" : [ "perl_5" ], @@ -36,7 +36,8 @@ "develop" : { "requires" : { "Test::CPAN::Meta" : "0", - "Test::MinimumVersion" : "0.10108", + "Test::MinimumVersion::Fast" : "0.04", + "Test::PAUSE::Permissions" : "0.04", "Test::Pod" : "1.41", "Test::Spellunker" : "v0.2.7" } @@ -47,7 +48,7 @@ "Exporter" : "0", "POSIX" : "0", "Time::Local" : "0", - "perl" : "5.008004" + "perl" : "5.008001" }, "suggests" : { "Time::TZOffset" : "0" @@ -62,7 +63,7 @@ "provides" : { "POSIX::strftime::Compiler" : { "file" : "lib/POSIX/strftime/Compiler.pm", - "version" : "0.31" + "version" : "0.40" } }, "release_status" : "stable", @@ -76,5 +77,8 @@ "web" : "https://github.com/kazeburo/POSIX-strftime-Compiler" } }, - "version" : "0.31" + "version" : "0.40", + "x_contributors" : [ + "Piotr Roszatycki <piotr.roszatycki(a)gmail.com>" + ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/POSIX-strftime-Compiler-0.31/META.yml new/POSIX-strftime-Compiler-0.40/META.yml --- old/POSIX-strftime-Compiler-0.31/META.yml 2014-02-24 07:27:15.000000000 +0100 +++ new/POSIX-strftime-Compiler-0.40/META.yml 2014-08-21 03:25:57.000000000 +0200 @@ -3,17 +3,17 @@ author: - 'Masahiro Nagano <kazeburo(a)gmail.com>' build_requires: - Test::More: 0.98 + Test::More: '0.98' configure_requires: - CPAN::Meta: 0 - CPAN::Meta::Prereqs: 0 - Module::Build: 0.38 + CPAN::Meta: '0' + CPAN::Meta::Prereqs: '0' + Module::Build: '0.38' dynamic_config: 0 -generated_by: 'Minilla/v0.11.0, CPAN::Meta::Converter version 2.132830' +generated_by: 'Minilla/v1.1.0, CPAN::Meta::Converter version 2.141170' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: POSIX-strftime-Compiler no_index: directory: @@ -28,15 +28,17 @@ provides: POSIX::strftime::Compiler: file: lib/POSIX/strftime/Compiler.pm - version: 0.31 + version: '0.40' requires: - Carp: 0 - Exporter: 0 - POSIX: 0 - Time::Local: 0 - perl: 5.008004 + Carp: '0' + Exporter: '0' + POSIX: '0' + Time::Local: '0' + perl: '5.008001' resources: bugtracker: https://github.com/kazeburo/POSIX-strftime-Compiler/issues homepage: https://github.com/kazeburo/POSIX-strftime-Compiler repository: git://github.com/kazeburo/POSIX-strftime-Compiler.git -version: 0.31 +version: '0.40' +x_contributors: + - 'Piotr Roszatycki <piotr.roszatycki(a)gmail.com>' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/POSIX-strftime-Compiler-0.31/README.md new/POSIX-strftime-Compiler-0.40/README.md --- old/POSIX-strftime-Compiler-0.31/README.md 2014-02-24 07:27:15.000000000 +0100 +++ new/POSIX-strftime-Compiler-0.40/README.md 2014-08-21 03:25:57.000000000 +0200 @@ -1,3 +1,4 @@ +[![Build Status](https://travis-ci.org/kazeburo/POSIX-strftime-Compiler.png?branch=m… # NAME POSIX::strftime::Compiler - GNU C library compatible strftime for loggers and servers @@ -8,7 +9,6 @@ say strftime('%a, %d %b %Y %T %z',localtime): - my $psc = POSIX::strftime::Compiler->new($fmt); say $psc->to_string(localtime); @@ -48,25 +48,25 @@ # A RECOMMEND MODULE -- [Time::TZOffset](http://search.cpan.org/perldoc?Time::TZOffset) +- [Time::TZOffset](https://metacpan.org/pod/Time::TZOffset) - If [Time::TZOffset](http://search.cpan.org/perldoc?Time::TZOffset) is available, P::s::Compiler use it for more faster time zone offset calculation. + If [Time::TZOffset](https://metacpan.org/pod/Time::TZOffset) is available, P::s::Compiler use it for more faster time zone offset calculation. I strongly recommend you to install this if you use `%z`. # PERFORMANCE ISSUES ON WINDOWS Windows and Cygwin and some system may not support `%z` and `%Z`. For these system, POSIX::strftime::Compiler calculate time zone offset and find zone name. This is not fast. -If you need performance on Windows and Cygwin, please install [Time::TZOffset](http://search.cpan.org/perldoc?Time::TZOffset) +If you need performance on Windows and Cygwin, please install [Time::TZOffset](https://metacpan.org/pod/Time::TZOffset) # SEE ALSO -- [POSIX::strftime::GNU](http://search.cpan.org/perldoc?POSIX::strftime::GNU) +- [POSIX::strftime::GNU](https://metacpan.org/pod/POSIX::strftime::GNU) POSIX::strftime::Compiler is built on POSIX::strftime::GNU::PP code -- [POSIX](http://search.cpan.org/perldoc?POSIX) -- [Apache::LogFormat::Compiler](http://search.cpan.org/perldoc?Apache::LogForm… +- [POSIX](https://metacpan.org/pod/POSIX) +- [Apache::LogFormat::Compiler](https://metacpan.org/pod/Apache::LogFormat::Co… # LICENSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/POSIX-strftime-Compiler-0.31/lib/POSIX/strftime/Compiler.pm new/POSIX-strftime-Compiler-0.40/lib/POSIX/strftime/Compiler.pm --- old/POSIX-strftime-Compiler-0.31/lib/POSIX/strftime/Compiler.pm 2014-02-24 07:27:15.000000000 +0100 +++ new/POSIX-strftime-Compiler-0.40/lib/POSIX/strftime/Compiler.pm 2014-08-21 03:25:57.000000000 +0200 @@ -1,6 +1,6 @@ package POSIX::strftime::Compiler; -use 5.008004; +use 5.008001; use strict; use warnings; use Carp; @@ -8,7 +8,7 @@ use POSIX qw//; use base qw/Exporter/; -our $VERSION = "0.31"; +our $VERSION = "0.40"; our @EXPORT_OK = qw/strftime/; use constant { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/POSIX-strftime-Compiler-0.31/minil.toml new/POSIX-strftime-Compiler-0.40/minil.toml --- old/POSIX-strftime-Compiler-0.31/minil.toml 2014-02-24 07:27:15.000000000 +0100 +++ new/POSIX-strftime-Compiler-0.40/minil.toml 2014-08-21 03:25:57.000000000 +0200 @@ -1,2 +1,2 @@ name = "POSIX-strftime-Compiler" -# badges = ["travis"] +badges = ["travis"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/POSIX-strftime-Compiler-0.31/t/04_tzset.t new/POSIX-strftime-Compiler-0.40/t/04_tzset.t --- old/POSIX-strftime-Compiler-0.31/t/04_tzset.t 2014-02-24 07:27:15.000000000 +0100 +++ new/POSIX-strftime-Compiler-0.40/t/04_tzset.t 2014-08-21 03:25:57.000000000 +0200 @@ -14,7 +14,7 @@ } my @timezones = ( - ['Australia/Darwin','+0930','+0930','+0930','+0930','CST','CST','CST','CST' ], + ['Australia/Darwin','+0930','+0930','+0930','+0930',qr/A?CST/,qr/A?CST/,qr/A?CST/,qr/A?CST/ ], ['Asia/Tokyo', '+0900','+0900','+0900','+0900', 'JST','JST','JST','JST'], ['UTC', '+0000','+0000','+0000','+0000','UTC','UTC','UTC','UTC'], ['Europe/London', '+0000','+0100','+0100','+0000',qr/(GMT|WET)/,qr/(BST|WEST)/,qr/(BST|WEST)/,qr/(GMT|WET|)/], -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_8_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package java-1_8_0-openjdk for openSUSE:Factory checked in at 2014-09-08 21:28:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_8_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes 2014-08-25 11:04:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk.changes 2014-09-08 21:30:17.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 8 07:46:47 UTC 2014 - fstrba(a)suse.com + +- Add provides jre-64 on x86_64. bnc#895191 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_8_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.ohRB81/_old 2014-09-08 21:30:20.000000000 +0200 +++ /var/tmp/diff_new_pack.ohRB81/_new 2014-09-08 21:30:20.000000000 +0200 @@ -250,6 +250,9 @@ Provides: java-%{javaver} = %{version}-%{release} Provides: java-openjdk = %{version}-%{release} Provides: jre = %{javaver} +%ifarch x86_64 +Provides: jre-64 = %{javaver} +%endif Provides: jre-%{javaver} = %{version}-%{release} Provides: jre-%{javaver}-openjdk = %{version}-%{release} Provides: jre-openjdk = %{version}-%{release} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit google-noto-fonts for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package google-noto-fonts for openSUSE:Factory checked in at 2014-09-08 21:28:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/google-noto-fonts (Old) and /work/SRC/openSUSE:Factory/.google-noto-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "google-noto-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/google-noto-fonts/google-noto-fonts.changes 2013-12-16 16:22:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.google-noto-fonts.new/google-noto-fonts.changes 2014-09-08 21:30:13.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Sep 1 12:31:50 UTC 2014 - ftake(a)geeko.jp + +- updated to version 20140716 + + Noto Sans S Chinese, T Chinese, Japanese, Korean are released + + *-ui fonts are removed +- update generate-specfile.sh + +------------------------------------------------------------------- Old: ---- NotoFonts-hinted-2013-04-11.tgz NotoFonts-unhinted-2013-04-18.tgz New: ---- Noto-hinted.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ google-noto-fonts.spec ++++++ ++++ 1884 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/google-noto-fonts/google-noto-fonts.spec ++++ and /work/SRC/openSUSE:Factory/.google-noto-fonts.new/google-noto-fonts.spec ++++++ generate-specfile.sh ++++++ --- /var/tmp/diff_new_pack.K4dAZo/_old 2014-09-08 21:30:17.000000000 +0200 +++ /var/tmp/diff_new_pack.K4dAZo/_new 2014-09-08 21:30:17.000000000 +0200 @@ -1,20 +1,16 @@ #!/bin/sh pkg_name="google-noto-fonts" -mkdir -p $pkg_name -for a in *.tgz; do - tar -x --directory=$pkg_name -f $a -done -mv ${pkg_name}/fonts/individual/unhinted/NotoSansMalayalam{,-Regular}.ttf -mv ${pkg_name}/fonts/individual/unhinted/NotoSansMalayalamUI{,-Regular}.ttf -# remove duplicities in fonts/individual/unhinted -for f in `ls ${pkg_name}/fonts/individual/unhinted`; do - if [ -e ${pkg_name}/fonts/individual/hinted/$f ]; then - rm ${pkg_name}/fonts/individual/unhinted/$f - fi + +for a in *.zip; do + mkdir -p $pkg_name + unzip -d $pkg_name $a done + +rm $pkg_name/LICENSE + cp -f $pkg_name.spec.in $pkg_name.spec -for h in hinted unhinted; do - ls $pkg_name/fonts/individual/$h/ | sed -e 's:Noto::' -e 's:-.*\.ttf::' -e 's:\.ttf::' | sort | uniq | while read font; do +for h in hinted; do + ls $pkg_name/ | sed -e 's:Noto::' -e 's:-.*\..tf::' -e 's:\..tf::' | sort | uniq | while read font; do serif=`echo $font | sed 's:$Sans\|Serif$.*:\1:'` ui=`(echo $font | grep -q UI) && echo UI` script=`echo $font | sed "s:$serif$.*$$ui:\1:"` @@ -46,7 +42,7 @@ sed -i "s/@SUBPACKAGE_FILELISTS@/%files -n $packagename\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_FILELISTS@/%defattr(-,root,root)\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec - sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui-\*.ttf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec + sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui-\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec sed -i "s/@SUBPACKAGE_FILELISTS@/\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec done done ++++++ google-noto-fonts.spec.in ++++++ --- /var/tmp/diff_new_pack.K4dAZo/_old 2014-09-08 21:30:17.000000000 +0200 +++ /var/tmp/diff_new_pack.K4dAZo/_new 2014-09-08 21:30:17.000000000 +0200 @@ -15,25 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define hyear 2013 -%define hmonth 04 -%define hday 11 -%define uhyear 2013 -%define uhmonth 04 -%define uhday 18 +%define hyear 2014 +%define hmonth 07 +%define hday 16 %define src_name NotoFonts Name: google-noto-fonts -Version: %{uhyear}%{uhmonth}%{uhday} +Version: %{hyear}%{hmonth}%{hday} Release: 0 Summary: Noto Font Families License: Apache-2.0 Group: System/X11/Fonts Url: https://code.google.com/p/noto/ -Source0: https://noto.googlecode.com/files/%{src_name}-hinted-%{hyear}-%{hmonth}-%{h… -Source1: https://noto.googlecode.com/files/%{src_name}-unhinted-%{uhyear}-%{uhmonth}… +Source0: http://www.google.com/get/noto/pkgs/Noto-hinted.zip Source2: generate-specfile.sh BuildRequires: fontpackages-devel +BuildRequires: unzip %reconfigure_fonts_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -45,28 +42,20 @@ @SUBPACKAGE_HEADERS@ %prep -%setup -q -c -T -a0 -a1 -mv fonts/individual/unhinted/NotoSansMalayalam{,-Regular}.ttf -mv fonts/individual/unhinted/NotoSansMalayalamUI{,-Regular}.ttf -# remove duplicities in fonts/individual/unhinted -for f in `ls fonts/individual/unhinted`; do - if [ -e fonts/individual/hinted/$f ]; then - rm fonts/individual/unhinted/$f - fi -done +%setup -q -c -n %{name}-%{version} %build %install mkdir -p %{buildroot}%{_ttfontsdir} -cp fonts/individual/hinted/*.ttf %{buildroot}%{_ttfontsdir}/ -cp fonts/individual/unhinted/*.ttf %{buildroot}%{_ttfontsdir}/ +cp *.ttf %{buildroot}%{_ttfontsdir}/ +cp *.otf %{buildroot}%{_ttfontsdir}/ @SUBPACKAGE_SCRIPTLETS@ %files %defattr(0644,root,root,755) -%doc COPYING +%doc LICENSE %dir %{_ttfontsdir} @SUBPACKAGE_FILELISTS@ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lxdm for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package lxdm for openSUSE:Factory checked in at 2014-09-08 21:28:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxdm (Old) and /work/SRC/openSUSE:Factory/.lxdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxdm" Changes: -------- --- /work/SRC/openSUSE:Factory/lxdm/lxdm.changes 2014-08-13 08:49:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxdm.new/lxdm.changes 2014-09-08 21:30:08.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Sep 3 21:19:26 UTC 2014 - trcs(a)gmx.com + +- Downgrade to version 0.4.1 + * version 0.5.0 breaks first boot after installation of 13.2 + * rolled back the following patches + lxdm-0.4.1-fix-small-bug-in-theme.patch + lxdm-0.4.0-gnome-start.patch + lxdm-0.5.0-use-openSUSE-background.patch + lxdm-bnc-741454-d4e41ec.patch + lxdm-0.4.0-common.patch + lxdm-0.5.0-use-sysconfig.patch + lxdm-0.4.1-fix-gtk2-keyboard-list-empty.patch + lxdm-0.5.0-common.patch + lxdm-0.4.0-fix-null-pointer-dereference.patch + lxdm-0.5.0-gnome-start.patch + lxdm-0.4.0-use-sysconfig.patch + lxdm-0.4.1-background-12.1.patch + +------------------------------------------------------------------- Old: ---- lxdm-0.5.0-common.patch lxdm-0.5.0-gnome-start.patch lxdm-0.5.0-use-openSUSE-background.patch lxdm-0.5.0-use-sysconfig.patch lxdm-0.5.0.tar.xz New: ---- lxdm-0.4.0-common.patch lxdm-0.4.0-fix-null-pointer-dereference.patch lxdm-0.4.0-gnome-start.patch lxdm-0.4.0-use-sysconfig.patch lxdm-0.4.1-background-12.1.patch lxdm-0.4.1-fix-gtk2-keyboard-list-empty.patch lxdm-0.4.1-fix-small-bug-in-theme.patch lxdm-0.4.1.tar.bz2 lxdm-bnc-741454-d4e41ec.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxdm.spec ++++++ --- /var/tmp/diff_new_pack.Cv9kE2/_old 2014-09-08 21:30:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Cv9kE2/_new 2014-09-08 21:30:10.000000000 +0200 @@ -16,34 +16,37 @@ # -%define _dminitdir %{_libexecdir}/X11/displaymanagers -%if ! %{defined _rundir} -%define _rundir %{_localstatedir}/run -%endif +%define _dminitdir %{_prefix}/lib/X11/displaymanagers + Name: lxdm -Version: 0.5.0 -Release: 0 Summary: LXDE Display Manager License: GPL-2.0 and LGPL-2.0 Group: System/GUI/LXDE +Version: 0.4.1 +Release: 0 Url: http://lxde.org/ -Source0: %{name}-%{version}.tar.xz +Source0: %name-%version.tar.bz2 Source1: README.SUSE Source2: %{name}.pamd -Source3: %{name}-config.desktop +Source3: lxdm-config.desktop Source4: config-users.png -Source5: %{name} -Source6: sysconfig.%{name} -# PATCH-FEATURE-OPENSUSE lxdm-0.5.0-use-sysconfig.patch andrea(a)opensuse.org +Source5: lxdm +Source6: sysconfig.lxdm +# PATCH-FEATURE-OPENSUSE lxdm-0.4.0-use-sysconfig.patch andrea(a)opensuse.org # this patch allow lxdm to read system settings from /etc/sysconfig -Patch1: %{name}-0.5.0-use-sysconfig.patch -Patch2: %{name}-0.5.0-gnome-start.patch -# PATCH-FIX-OPENSUSE lxdm-0.5.0-common.patch werner(a)novell.com +Patch1: %{name}-0.4.0-use-sysconfig.patch +Patch2: %{name}-0.4.0-gnome-start.patch +# PATCH-FIX-OPENSUSE lxdm-0.4.0-common.patch werner(a)novell.com # this patch fix bnc#586555 lxdm now use common scripts in /etc/X11/xdm -Patch3: %{name}-0.5.0-common.patch +Patch3: %{name}-0.4.0-common.patch +Patch4: %{name}-0.4.0-fix-null-pointer-dereference.patch # Patch needed to use current new default wallpaper location # bnc#732671 -Patch4: %{name}-0.5.0-use-openSUSE-background.patch +Patch5: %{name}-0.4.1-background-12.1.patch +Patch6: %{name}-bnc-741454-d4e41ec.patch +Patch7: %{name}-0.4.1-fix-gtk2-keyboard-list-empty.patch +Patch8: %{name}-0.4.1-fix-small-bug-in-theme.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ConsoleKit-devel BuildRequires: autoconf BuildRequires: automake @@ -57,16 +60,16 @@ BuildRequires: make BuildRequires: pam-devel BuildRequires: pkg-config -BuildRequires: systemd-devel BuildRequires: update-desktop-files Requires: desktop-data-openSUSE Requires: pam -# FIXME: use proper Requires(pre/post/preun/...) PreReq: %fillup_prereq Recommends: gnome-control-center-user-faces -Provides: lxdm-conf = %{version} -Obsoletes: lxdm-conf < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: lxdm-conf = %version +Obsoletes: lxdm-conf < %version +%if ! %{defined _rundir} +%define _rundir %{_localstatedir}/run +%endif %description LXDM is the future display manager of LXDE, the Lightweight X11 Desktop @@ -79,58 +82,59 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -cp %{SOURCE1} . +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 + +%__cp %{SOURCE1} . %build autoreconf -fi %configure -make %{?_smp_mflags} +%__make %{?jobs:-j%{jobs}} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} -mkdir -p %{buildroot}/%{_bindir} -mkdir -p %{buildroot}/%{_datadir}/applications -install %{SOURCE3} %{buildroot}/%{_datadir}/applications/ +%makeinstall +%__mkdir_p %buildroot/%_bindir +%__mkdir_p %buildroot/%_datadir/applications +install %SOURCE3 %buildroot/%_datadir/applications/ #need by post checks -mkdir -p %{buildroot}/%{_datadir}/pixmaps -install %{SOURCE4} %{buildroot}/%{_datadir}/pixmaps +%__mkdir_p %buildroot/%_datadir/pixmaps +install %SOURCE4 %buildroot/%_datadir/pixmaps + %suse_update_desktop_file lxdm-config -rm %{buildroot}/%{_sbindir}/%{name} -rm -rf %{buildroot}/%{_sysconfdir}/pam.d/%{name} -install %{SOURCE2} %{buildroot}/%{_sysconfdir}/pam.d/%{name} -chmod -x %{buildroot}/%{_sysconfdir}/pam.d/%{name} -ln -sf %{_sbindir}/%{name}-binary %{buildroot}/%{_bindir}/%{name} -%find_lang %{name} -mkdir -p %{buildroot}/%{_rundir} -mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name} -touch %{buildroot}/%{_rundir}/%{name}.pid -mkdir -p %{buildroot}%{_dminitdir}/ -cp %{SOURCE5} %{buildroot}%{_dminitdir}/ -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +%__rm %buildroot/%_sbindir/%name +%__rm -rf %buildroot/%_sysconfdir/pam.d/%name +install %SOURCE2 %buildroot/%_sysconfdir/pam.d/%name +chmod -x %buildroot/%_sysconfdir/pam.d/%name +ln -sf %_sbindir/%name-binary %buildroot/%_bindir/%name +%find_lang %name +%__mkdir_p %buildroot/%_rundir +%__mkdir_p %buildroot/%_localstatedir/lib/%name +touch %buildroot/%_rundir/%name.pid +%__mkdir_p %{buildroot}%{_dminitdir}/ +%__cp %{SOURCE5} %{buildroot}%{_dminitdir}/ +%__mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates cp %{SOURCE6} %{buildroot}%{_localstatedir}/adm/fillup-templates/ -%fdupes -s %{buildroot}/%{_datadir} +%fdupes -s %buildroot/%_datadir %pre -%{_sbindir}/groupadd -r lxdm 2> /dev/null || : -%{_sbindir}/useradd -r -g lxdm -s /bin/false \ --c "LXDE Display Manager daemon" -d %{_localstatedir}/lib/lxdm lxdm 2> /dev/null || : -%{_sbindir}/usermod -g lxdm -G lxdm -s /bin/false lxdm 2> /dev/null -%service_add_pre %{name}.service +/usr/sbin/groupadd -r lxdm 2> /dev/null || : +/usr/sbin/useradd -r -g lxdm -s /bin/false \ +-c "LXDE Display Manager daemon" -d /var/lib/lxdm lxdm 2> /dev/null || : +/usr/sbin/usermod -g lxdm -G lxdm -s /bin/false lxdm 2> /dev/null -# this is only needed on initial upgrades because of the "noreplace" +# this is only needed on initial upgrades becuase of the "noreplace" # option into files section %post -chmod 640 %{_sysconfdir}/%{name}/%{name}.conf -chown lxdm:lxdm %{_sysconfdir}/%{name}/%{name}.conf +chmod 640 %_sysconfdir/%name/%name.conf +chown lxdm:lxdm %_sysconfdir/%name/%name.conf %{fillup_only -ns displaymanager lxdm} -%service_add_post %{name}.service - -%preun -%service_del_preun %{name}.service -%files -f %{name}.lang +%files -f %name.lang %defattr (-,root,root,-) %doc AUTHORS README COPYING README.SUSE %dir %{_datadir}/%{name}/ @@ -144,7 +148,6 @@ %{_libexecdir}/%{name}-greeter-gtk %{_libexecdir}/%{name}-greeter-gdk %{_libexecdir}/%{name}-numlock -%{_libexecdir}/%{name}-session %config(noreplace) %{_sysconfdir}/%{name}/Xsession %config(noreplace) %{_sysconfdir}/%{name}/PreReboot %config(noreplace) %{_sysconfdir}/%{name}/PreShutdown @@ -155,10 +158,9 @@ %attr(640,lxdm,lxdm) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/pam.d/%{name} %attr(750,lxdm,lxdm) %dir %{_localstatedir}/lib/%{name} -%ghost %{_rundir}/%{name}.pid -%exclude /%{_datadir}/pixmaps +%ghost %_rundir/%{name}.pid +%exclude /%_datadir/pixmaps %{_dminitdir}/lxdm %config %{_localstatedir}/adm/fillup-templates/sysconfig.lxdm -%{_unitdir}/%{name}.service %changelog ++++++ lxdm-0.5.0-common.patch -> lxdm-0.4.0-common.patch ++++++ --- /work/SRC/openSUSE:Factory/lxdm/lxdm-0.5.0-common.patch 2014-07-16 16:36:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxdm.new/lxdm-0.4.0-common.patch 2014-09-08 21:30:08.000000000 +0200 @@ -1,27 +1,31 @@ ---- lxdm-70843c4-old/data/LoginReady.in 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/data/LoginReady.in 2014-07-05 13:31:20.257916715 +0200 +diff -uNr old-lxdm-0.4.0.git.1310644223//data/LoginReady.in lxdm-0.4.0.git.1310644223//data/LoginReady.in +--- old-lxdm-0.4.0.git.1310644223//data/LoginReady.in 2011-07-15 15:17:02.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//data/LoginReady.in 2011-07-15 15:18:16.341044121 +0200 @@ -1,3 +1,2 @@ #!/bin/sh -# -# Note: this is a sample and will not be run as is. +test -x /etc/X11/xdm/Xsetup && exec /etc/X11/xdm/Xsetup ---- lxdm-70843c4-old/data/PostLogout.in 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/data/PostLogout.in 2014-07-05 13:31:43.993586553 +0200 +diff -uNr old-lxdm-0.4.0.git.1310644223//data/PostLogout.in lxdm-0.4.0.git.1310644223//data/PostLogout.in +--- old-lxdm-0.4.0.git.1310644223//data/PostLogout.in 2011-07-15 15:17:02.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//data/PostLogout.in 2011-07-15 15:18:16.341044121 +0200 @@ -1,3 +1,2 @@ #!/bin/sh -# -# Note: this is a sample and will not be run as is. +test -x /etc/X11/xdm/Xreset && exec /etc/X11/xdm/Xreset ---- lxdm-70843c4-old/data/PreLogin.in 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/data/PreLogin.in 2014-07-05 13:32:34.835782226 +0200 +diff -uNr old-lxdm-0.4.0.git.1310644223//data/PreLogin.in lxdm-0.4.0.git.1310644223//data/PreLogin.in +--- old-lxdm-0.4.0.git.1310644223//data/PreLogin.in 2011-07-15 15:17:02.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//data/PreLogin.in 2011-07-15 15:18:16.342044142 +0200 @@ -1,3 +1,2 @@ #!/bin/sh -# -# Note: this is a sample and will not be run as is. +test -x /etc/X11/xdm/Xstartup && exec /etc/X11/xdm/Xstartup ---- lxdm-70843c4-old/data/Xsession 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/data/Xsession 2014-07-05 13:36:21.672167760 +0200 -@@ -1,48 +1,26 @@ +diff -uNr old-lxdm-0.4.0.git.1310644223//data/Xsession lxdm-0.4.0.git.1310644223//data/Xsession +--- old-lxdm-0.4.0.git.1310644223//data/Xsession 2011-07-15 15:17:02.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//data/Xsession 2011-07-15 15:19:16.391044441 +0200 +@@ -1,46 +1,26 @@ #!/bin/bash -# use bash for "exec -l", howto run login shell by /bin/sh ? @@ -47,7 +51,12 @@ -if [ -f /etc/X11/xinit/xinitrc-common ]; then -# fedora - . /etc/X11/xinit/xinitrc-common -- exec -l bash -c "$LXSESSION" +- if ! [ -z "$XDG_SESSION_COOKIE" ]; then +- CK_XINIT_SESSION= +- elif [ -x /usr/bin/ck-launch-session -a -z "$CK_XINIT_SESSION" ]; then +- CK_XINIT_SESSION="/usr/bin/ck-launch-session" +- fi +- exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" -elif [ -x /etc/X11/xinit/Xsession ]; then -# fedora - exec /etc/X11/xinit/Xsession "$LXSESSION" @@ -57,29 +66,23 @@ -elif [ -x /etc/X11/xinit/xinitrc ]; then -#suse - export WINDOWMANAGER=$LXSESSION -- exec -l bash -c /etc/X11/xinit/xinitrc +- exec -l $SHELL -c /etc/X11/xinit/xinitrc -else # unknown, user should custom /etc/lxdm/xinitrc self - if [ -x /etc/lxdm/xinitrc ]; then -- . /etc/lxdm/xinitrc "$LXSESSION" -- fi -- if [ -d /etc/X11/xinit/xinitrc.d ] ; then -- for f in /etc/X11/xinit/xinitrc.d/* ; do -- [ -x "$f" ] && . "$f" -- done -- unset f +- . /etc/lxdm/xinitrc - fi -- -- if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; -- then -- eval "$(dbus-launch --sh-syntax --exit-with-session)" +- if ! [ -z "$XDG_SESSION_COOKIE" ]; then +- CK_XINIT_SESSION= +- elif [ -x /usr/bin/ck-launch-session ]; then +- CK_XINIT_SESSION="/usr/bin/ck-launch-session" - fi +- exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" +test -s /etc/lxdm/xinitrc && . /etc/lxdm/xinitrc - -- exec -l bash -c "$LXSESSION" ++ +if ! test -z "$XDG_SESSION_COOKIE" ; then + CK_XINIT_SESSION= -+elif test- x /usr/bin/ck-launch-session ; then ++elif test -x /usr/bin/ck-launch-session ; then + CK_XINIT_SESSION="/usr/bin/ck-launch-session" fi +exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" ++++++ lxdm-0.4.0-fix-null-pointer-dereference.patch ++++++ diff -urNp lxdm-0.4.0.orig/src/config.c lxdm-0.4.0/src/config.c --- lxdm-0.4.0.orig/src/config.c 2011-07-29 20:56:35.000000000 +0200 +++ lxdm-0.4.0/src/config.c 2011-07-29 20:57:45.000000000 +0200 @@ -127,24 +127,19 @@ static gboolean image_file_valid(const c static void update_face_image(GtkWidget *w) { GdkPixbuf *pixbuf; - char *path; - path=g_build_filename(user->pw_dir,".face",NULL); - if(access(path,R_OK)) - { - g_free(path); - if(ui_nobody) - pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); - if(!pixbuf) - pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), + char *path=g_build_filename(user->pw_dir,".face",NULL); + pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); + g_free(path); + if(!pixbuf && ui_nobody) + pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); + if(!pixbuf) + pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), "avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL); - } - else + if(pixbuf) { - pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); - g_free(path); + gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); + g_object_unref(pixbuf); } - gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); - g_object_unref(pixbuf); } static void set_face_file(const char *filename) ++++++ lxdm-0.5.0-gnome-start.patch -> lxdm-0.4.0-gnome-start.patch ++++++ --- /work/SRC/openSUSE:Factory/lxdm/lxdm-0.5.0-gnome-start.patch 2014-07-16 16:36:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxdm.new/lxdm-0.4.0-gnome-start.patch 2014-09-08 21:30:08.000000000 +0200 @@ -1,6 +1,7 @@ ---- lxdm-70843c4/src/lxdm.c.old 2014-07-05 14:10:05.483754732 +0200 -+++ lxdm-70843c4/src/lxdm.c 2014-07-05 14:10:16.409572981 +0200 -@@ -1111,7 +1111,7 @@ +diff -uNr old-lxdm-0.4.0.git.1310644223//src/lxdm.c lxdm-0.4.0.git.1310644223//src/lxdm.c +--- old-lxdm-0.4.0.git.1310644223//src/lxdm.c 2011-07-15 15:14:21.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//src/lxdm.c 2011-07-15 15:15:27.939044540 +0200 +@@ -1267,7 +1267,7 @@ if(!strcasecmp(name,"LXDE")) exec = g_strdup("startlxde"); else if( !strcasecmp(name, "GNOME") ) ++++++ lxdm-0.5.0-use-sysconfig.patch -> lxdm-0.4.0-use-sysconfig.patch ++++++ --- /work/SRC/openSUSE:Factory/lxdm/lxdm-0.5.0-use-sysconfig.patch 2014-07-16 16:36:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxdm.new/lxdm-0.4.0-use-sysconfig.patch 2014-09-08 21:30:08.000000000 +0200 @@ -1,5 +1,6 @@ ---- lxdm-70843c4-old/data/lxdm.conf.in 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/data/lxdm.conf.in 2014-07-05 12:12:59.000000000 +0200 +diff -uNr old-lxdm-0.4.0//data/lxdm.conf.in lxdm-0.4.0/data/lxdm.conf.in +--- old-lxdm-0.4.0//data/lxdm.conf.in 2011-07-28 00:01:57.537862491 +0200 ++++ lxdm-0.4.0/data/lxdm.conf.in 2011-07-28 00:02:14.276862487 +0200 @@ -1,14 +1,8 @@ [base] -## uncomment and set autologin username to enable autologin @@ -15,44 +16,19 @@ ## uncomment and set to set numlock on your keyboard # numlock=0 ---- lxdm-70843c4-old//src/config.c 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/src/config.c 2014-07-05 12:20:43.000000000 +0200 -@@ -29,6 +29,7 @@ - #include <stdlib.h> +diff -uNr old-lxdm-0.4.0//src/config.c lxdm-0.4.0/src/config.c +--- old-lxdm-0.4.0//src/config.c 2011-07-28 00:01:57.536862491 +0200 ++++ lxdm-0.4.0/src/config.c 2011-07-29 00:33:16.802620577 +0200 +@@ -30,6 +30,8 @@ #include <pwd.h> #include <unistd.h> -+#include "suse-sysconfig.h" ++#include "suse-sysconfig.h" ++ #define CONFIG_UI_FILE LXDM_DATA_DIR"/config.ui" //#define CONFIG_UI_FILE "../data/config.ui" -@@ -74,7 +75,7 @@ - g_key_file_load_from_file(config,CONFIG_FILE,G_KEY_FILE_KEEP_COMMENTS,NULL); - theme_name=g_key_file_get_string(config,"display", "theme", NULL); - theme_dir=g_build_filename(LXDM_DATA_DIR "/themes", theme_name, NULL); -- -+ - ui_nobody = g_build_filename(theme_dir, "nobody.png", NULL); - if( !g_file_test(ui_nobody, G_FILE_TEST_EXISTS) ) - { -@@ -273,7 +274,7 @@ - GDir *dir; - const char *face; - menu=gtk_menu_new(); -- -+ - dir=g_dir_open(FACES_DIR,0,NULL); - if(dir) while((face=g_dir_read_name(dir))!=NULL) - { -@@ -317,7 +318,7 @@ - G_CALLBACK (file_icon_selected), NULL); - gtk_widget_show (menuitem); - photo_popup=menu; -- -+ - g_signal_connect (menu, "unmap",G_CALLBACK (on_photo_popup_unmap), togglebutton); - } - if(gtk_toggle_button_get_active(togglebutton)) -@@ -367,13 +368,18 @@ + #define FACES_DIR "/usr/share/pixmaps/faces" +@@ -372,13 +374,18 @@ gtk_label_set_text(GTK_LABEL(w),user_name); } @@ -68,13 +44,13 @@ +/* I don't have a gdm_sysconfig_remove_value(), so just replace with a "save" with empty string + * g_key_file_remove_key(config,"base","autologin",NULL); + */ -+ result = gdm_sysconfig_save_value(SYSCONFIG_AUTOLOGIN_FILE, SYSCONFIG_AUTOLOGIN_KEY, ""); ++ result = gdm_sysconfig_save_value(SYSCONFIG_AUTOLOGIN_FILE, SYSCONFIG_AUTOLOGIN_KEY, ""); dirty++; + return result; } void prepare_user_autologin(GtkBuilder *builder) -@@ -383,7 +389,7 @@ +@@ -388,7 +395,7 @@ w=(GtkWidget*)gtk_builder_get_object(builder,"user-autologin"); if(!root) gtk_widget_set_sensitive(w,FALSE); g_signal_connect(w,"toggled",G_CALLBACK(on_user_autologin_toggled),NULL); @@ -83,53 +59,9 @@ if(!name) return; if(!strcmp(name,user_name)) { -@@ -507,7 +513,7 @@ - GtkWidget *w; - w=(GtkWidget*)gtk_builder_get_object(builder,"vbox2"); - val=g_key_file_get_integer(config,"display","bottom_pane",NULL); -- if(!root) -+ if(!root) - { - gtk_widget_set_sensitive(w,FALSE); - } -@@ -653,7 +659,7 @@ - GtkDialog *dialog_create(void) - { - GtkDialog *dlg; -- -+ - builder=gtk_builder_new(); - gtk_builder_add_from_file(builder,CONFIG_UI_FILE,NULL); - dlg=(GtkDialog*)gtk_builder_get_object(builder,"lxdm-config-dlg"); -@@ -686,7 +692,7 @@ - GError *error = NULL; - GOptionContext *context; - GtkDialog *dlg; -- -+ - context = g_option_context_new ("- lxdm config"); - g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); - g_option_context_add_group (context, gtk_get_option_group (TRUE)); -@@ -696,7 +702,7 @@ - exit (1); - } - prepare_user(); -- -+ - #if !GTK_CHECK_VERSION(3,0,0) - gtk_set_locale(); - #endif -@@ -708,7 +714,7 @@ - dlg=dialog_create(); - if(!dlg) exit(-1); - gtk_dialog_run(dlg); -- -+ - if(dirty) - { - gsize length; ---- lxdm-70843c4-old/src/gdm/gdm-sysconfig.c 1970-01-01 01:00:00.000000000 +0100 -+++ lxdm-70843c4/src/gdm/gdm-sysconfig.c 2014-07-05 12:37:30.000000000 +0200 +diff -uNr old-lxdm-0.4.0//src/gdm/gdm-sysconfig.c lxdm-0.4.0/src/gdm/gdm-sysconfig.c +--- old-lxdm-0.4.0//src/gdm/gdm-sysconfig.c 1970-01-01 01:00:00.000000000 +0100 ++++ lxdm-0.4.0/src/gdm/gdm-sysconfig.c 2011-07-29 00:09:51.029620578 +0200 @@ -0,0 +1,484 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -615,8 +547,9 @@ + g_strfreev (lines); + return result; +} ---- lxdm-70843c4-old/src/gdm/gdm-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ lxdm-70843c4/src/gdm/gdm-sysconfig.h 2014-07-05 12:40:55.000000000 +0200 +diff -uNr old-lxdm-0.4.0//src/gdm/gdm-sysconfig.h lxdm-0.4.0/src/gdm/gdm-sysconfig.h +--- old-lxdm-0.4.0//src/gdm/gdm-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 ++++ lxdm-0.4.0/src/gdm/gdm-sysconfig.h 2011-07-29 00:09:51.029620578 +0200 @@ -0,0 +1,43 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -661,142 +594,19 @@ +G_END_DECLS + +#endif /* __GDM_SYSCONFIG_H */ -\ No newline at end of file ---- lxdm-70843c4-old/src/lxdm.c 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/src/lxdm.c 2014-07-05 12:26:50.000000000 +0200 -@@ -78,6 +78,7 @@ - #include "auth.h" +diff -uNr old-lxdm-0.4.0//src/lxdm.c lxdm-0.4.0/src/lxdm.c +--- old-lxdm-0.4.0//src/lxdm.c 2011-07-28 00:01:57.536862491 +0200 ++++ lxdm-0.4.0/src/lxdm.c 2011-07-28 00:05:33.632862492 +0200 +@@ -72,6 +72,8 @@ #define LOGFILE "/var/log/lxdm.log" -+#include "suse-sysconfig.h" ++#include "suse-sysconfig.h" ++ typedef struct{ gboolean idle; -@@ -279,7 +280,7 @@ - static LXSession *lxsession_add(void) - { - LXSession *s; -- -+ - s=lxsession_find_idle(); - if(s) return s; - if(g_slist_length(session_list)>=4) -@@ -423,7 +424,7 @@ - char **arg; - int i; - int novtswitch=0; -- -+ - if(s->option) - { - p=g_key_file_get_string(config,s->option,"xarg",0); -@@ -431,7 +432,7 @@ - } - - p=g_key_file_get_string(config, "server", "arg", 0); -- if(!p) p=g_strdup("/usr/bin/X"); -+ if(!p) p=g_strdup("/usr/bin/X"); - g_shell_parse_argv(p, &arc, &arg, 0); - g_free(p); - for(i=1;i<arc;) -@@ -500,7 +501,7 @@ - int len; - int gotvtarg = 0; - gboolean plymouth; -- -+ - plymouth=plymouth_is_running(); - if(plymouth) - { -@@ -664,10 +665,10 @@ - int fd; - char addr[128]; - char buf[16]; -- -+ - sprintf(buf,"%d",dpy); - gethostname(addr,sizeof(addr)); -- -+ - fd=open(file,O_CREAT|O_TRUNC|O_WRONLY,0600); - if(!fd==-1) return; - xauth_write_uint16(fd,256); //FamilyLocalHost -@@ -704,14 +705,14 @@ - { - LXSession *s; - char *authfile; -- -+ - if(pw->pw_uid==0) /* root don't need it */ - return env; -- -+ - s=lxsession_find_user(pw->pw_uid); - if(!s) - return env; -- -+ - /* pam_mktemp may provide XAUTHORITY to DM, just use it */ - if((authfile=(char*)g_environ_getenv(env,"XAUTHORITY"))!=NULL) - { -@@ -736,7 +737,7 @@ - env=g_environ_setenv(env,"XAUTHORITY",authfile,TRUE); - chown(authfile,pw->pw_uid,pw->pw_gid); - g_free(authfile); -- -+ - return env; - } - #endif -@@ -777,7 +778,7 @@ - close(fd); - } - free(list); -- -+ - int fd = open("/dev/null", O_WRONLY); - if(fd == -1) return; - dup2(fd, 1); -@@ -788,7 +789,7 @@ - void switch_user(struct passwd *pw, const char *run, char **env) - { - int fd; -- -+ - setenv("USER",pw->pw_name,1); - setenv("LOGNAME",pw->pw_name,1); - setenv("SHELL",pw->pw_shell,1); -@@ -848,7 +849,7 @@ - lxdm_quit_self(1); - #else - lxdm_quit_self(1); --#endif -+#endif - } - } - } -@@ -917,9 +918,9 @@ - char **args; - int i; - char display[16]; -- -+ - lxsession_set_active(s); -- -+ - sprintf(display,":%d",s->display); - setenv("DISPLAY",display,1); - -@@ -964,7 +965,7 @@ - g_message("%ld: start xserver in %d retry",time(NULL),i); - if(s->dpy==NULL) - exit(EXIT_FAILURE); -- -+ - if(s->option && g_key_file_has_key(config,s->option,"numlock",NULL)) - { - i=g_key_file_get_integer(config,s->option,"numlock",0); -@@ -1052,7 +1053,7 @@ + gboolean greeter; +@@ -1209,7 +1211,7 @@ char *name=NULL,*exec=NULL; if(!session || !session[0]) { @@ -804,56 +614,8 @@ + name=gdm_sysconfig_load_value(SYSCONFIG_SESSION_FILE, SYSCONFIG_SESSION_KEY); if(!name && getenv("PREFERRED")) name = g_strdup(getenv("PREFERRED")); - if(!name && getenv("DESKTOP")) -@@ -1078,7 +1079,7 @@ - g_free(name); - g_free(exec); - return FALSE; -- } -+ } - } - else - { -@@ -1198,7 +1199,7 @@ - gboolean alloc_session=FALSE,alloc_lang=FALSE; - int pid; - LXSession *s,*prev; -- -+ - lxdm_save_login(session,lang); - if(!strcmp(session,"__default__")) - session=NULL; -@@ -1288,7 +1289,7 @@ - d = x; n = getenv("DISPLAY"); - if( ck_connector_open_session_with_parameters(s->ckc, &error, - "unix-user", &pw->pw_uid, -- // disable this, follow the gdm way -+ // disable this, follow the gdm way - //"display-device", &d, - "x11-display-device", &d, - "x11-display", &n, -@@ -1329,7 +1330,7 @@ - env=g_environ_setenv(env, "LC_MESSAGES", lang, TRUE); - env=g_environ_setenv(env, "LANGUAGE", lang, TRUE); - } -- -+ - #ifndef DISABLE_XAUTH - env=create_client_auth(pw,env); - #endif -@@ -1343,9 +1344,9 @@ - switch_user(pw, session_exec, env); - lxdm_quit_self(4); - }*/ -- -+ - s->child = pid = lxdm_auth_session_run(&s->auth,session_exec,env); -- -+ - g_free(session_name); - g_free(session_exec); - if(alloc_session) -@@ -1390,7 +1391,7 @@ + if(!session && getenv("DESKTOP")) +@@ -1538,7 +1540,7 @@ int i,count,ret; int success=0; @@ -862,71 +624,27 @@ if(!p) return 0; users=g_strsplit(p," ",8); g_free(p); -@@ -1424,7 +1425,7 @@ - /* autologin users starting with '@' get own config section with - * user=, session= and lang= entry - */ -- if(p[0]=='@') -+ if(p[0]=='@') - { - option=p+1; - user=g_key_file_get_string(config,option,"user",NULL); -@@ -1536,7 +1537,7 @@ - char *face; - char **black=NULL; - char **white=NULL; -- -+ - // load black list - face=g_key_file_get_string(config,"userlist","black",NULL); - if(face) -@@ -1558,7 +1559,7 @@ - { - char *valid_shell; - gboolean ret; -- -+ - if(strstr(pw->pw_shell, "nologin")) - continue; - -@@ -1663,7 +1664,7 @@ - } - else if(!strcmp(arg[i],"-c") && i+1<arc) - { -- return lxcom_send("/var/run/lxdm/lxdm.sock",arg[i+1],NULL)?0:-1; -+ return lxcom_send("/var/run/lxdm/lxdm.sock",arg[i+1],NULL)?0:-1; - } - else if(!strcmp(arg[i],"-w") && i+1<arc) - { -@@ -1696,7 +1697,7 @@ - g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_NONE, NULL); - - get_lock(); -- -+ - if(0!=mkdir("/var/run/lxdm",0755)) - { - if(errno==EEXIST) ---- lxdm-70843c4-old/src/Makefile.am 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/src/Makefile.am 2014-07-05 12:29:10.000000000 +0200 -@@ -22,6 +22,7 @@ +diff -uNr old-lxdm-0.4.0//src/Makefile.am lxdm-0.4.0/src/Makefile.am +--- old-lxdm-0.4.0//src/Makefile.am 2011-07-28 00:01:57.536862491 +0200 ++++ lxdm-0.4.0/src/Makefile.am 2011-07-28 00:16:01.647862492 +0200 +@@ -21,6 +21,7 @@ lxdm_binary_SOURCES = \ - lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h auth.c auth.h lxcommon.h \ + lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h \ + gdm/gdm-sysconfig.c gdm/gdm-sysconfig.h suse-sysconfig.h\ $(NULL) - libexec_PROGRAMS = lxdm-greeter-gdk lxdm-numlock lxdm-greeter-gtk lxdm-session -@@ -112,6 +113,7 @@ + libexec_PROGRAMS = lxdm-greeter-gdk lxdm-numlock lxdm-greeter-gtk +@@ -98,5 +99,6 @@ lxdm_config_SOURCES = \ config.c \ + gdm/gdm-sysconfig.c gdm/gdm-sysconfig.h suse-sysconfig.h\ $(NULL) - ---- lxdm-70843c4-old/src/suse-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ lxdm-70843c4/src/suse-sysconfig.h 2014-07-05 12:45:03.000000000 +0200 +diff -uNr old-lxdm-0.4.0//src/suse-sysconfig.h lxdm-0.4.0/src/suse-sysconfig.h +--- old-lxdm-0.4.0//src/suse-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 ++++ lxdm-0.4.0/src/suse-sysconfig.h 2011-07-28 00:24:29.437862492 +0200 @@ -0,0 +1,32 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * ++++++ lxdm-0.4.1-background-12.1.patch ++++++ --- lxdm-0.4.1.old/data/lxdm.conf.in 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1/data/lxdm.conf.in 2011-12-02 16:46:15.821006819 +0100 @@ -27,7 +27,7 @@ gtk_theme=Clearlooks ## background of the greeter -bg=/usr/share/backgrounds/default.png +bg=/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1080.jpg ## if show bottom pane bottom_pane=1 ++++++ lxdm-0.4.1-fix-gtk2-keyboard-list-empty.patch ++++++ From: 4e4f5ca87fb03c2e5b937f381673c51fd00bcb54 2012-10-22 From: dgod <dgod.osa(a)gmail.com> Subject: [PATCH] fix gtk2 keyboard list empty diff -uNr lxdm-0.4.1-old/data/themes/Industrial/greeter.ui lxdm-0.4.1-new/data/themes/Industrial/greeter.ui --- lxdm-0.4.1-old/data/themes/Industrial/greeter.ui 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1-new/data/themes/Industrial/greeter.ui 2012-10-22 11:15:02.000000000 +0200 @@ -201,7 +201,9 @@ </packing> </child> <child> - <object class="GtkComboBoxEntry" id="keyboard"/> + <object class="GtkComboBoxEntry" id="keyboard"> + <property name="text_column">0</property> + </object> <packing> <property name="expand">False</property> <property name="position">3</property> diff -uNr lxdm-0.4.1-old/data/lxdm.glade lxdm-0.4.1-new/data/lxdm.glade --- lxdm-0.4.1-old/data/lxdm.glade 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1-new/data/lxdm.glade 2012-10-22 11:15:02.000000000 +0200 @@ -125,7 +125,9 @@ </packing> </child> <child> - <object class="GtkComboBoxEntry" id="keyboard"/> + <object class="GtkComboBoxEntry" id="keyboard"> + <property name="text_column">0</property> + </object> <packing> <property name="expand">False</property> <property name="position">3</property> ++++++ lxdm-0.4.1-fix-small-bug-in-theme.patch ++++++ From: 8bdf42d903408ed6111b95a2992f3b9d471cfab6 2012-05-29 From: dgod <dgod.osa(a)gmail.com> Subject: [PATCH] fix small bug in theme diff -uNr lxdm-0.4.1-old/data/themes/Industrial/greeter-gtk3.ui lxdm-0.4.1-new/data/themes/Industrial/greeter-gtk3.ui --- lxdm-0.4.1-old/data/themes/Industrial/greeter-gtk3.ui 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1-new/data/themes/Industrial/greeter-gtk3.ui 2014-04-18 19:41:03.548173619 +0200 @@ -1,7 +1,5 @@ <?xml version="1.0"?> <interface> -  -  <object class="GtkWindow" id="lxdm"> <property name="decorated">False</property> <child> diff -uNr lxdm-0.4.1-old/data/themes/Industrial/gtkrc lxdm-0.4.1-new/data/themes/Industrial/gtkrc --- lxdm-0.4.1-old/data/themes/Industrial/gtkrc 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1-new/data/themes/Industrial/gtkrc 2014-04-18 19:40:46.627466119 +0200 @@ -45,6 +45,6 @@ widget "lxdm" style "back" widget "lxdm.*.time" style "time" -widget "lxdm.*.prompt" style "prompt" +widget "*.prompt" style "prompt" widget "lxdm.*.bottom_pane" style "bottom" widget_class "GtkWindow.*.GtkEventBox.*.<GtkLabel>" style "bottom" ++++++ lxdm-0.5.0.tar.xz -> lxdm-0.4.1.tar.bz2 ++++++ ++++ 17050 lines of diff (skipped) ++++++ lxdm-bnc-741454-d4e41ec.patch ++++++ >From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001 From: dgod <dgod.osa(a)gmail.com> Date: Sun, 25 Dec 2011 15:23:19 +0800 Subject: [PATCH] fix event check bug caused cpu 100% --- src/lxcom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lxcom.c b/src/lxcom.c index 02763eb..18ee12e 100644 --- a/src/lxcom.c +++ b/src/lxcom.c @@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout) static gboolean lxcom_check(GSource *source) { - return TRUE; + return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE; } static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data) -- 1.7.4.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfce4-power-manager for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package xfce4-power-manager for openSUSE:Factory checked in at 2014-09-08 21:28:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-power-manager (Old) and /work/SRC/openSUSE:Factory/.xfce4-power-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-power-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-power-manager/xfce4-power-manager.changes 2014-08-27 16:53:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-power-manager.new/xfce4-power-manager.changes 2014-09-08 21:30:06.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 8 07:08:19 UTC 2014 - gber(a)opensuse.org + +- add xfce4-power-manager-lxpanel-0.7-support.patch which adds + support for lxpanel >= 0.7 (bxo#11108) + +------------------------------------------------------------------- New: ---- xfce4-power-manager-lxpanel-0.7-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.tlmpJk/_old 2014-09-08 21:30:08.000000000 +0200 +++ /var/tmp/diff_new_pack.tlmpJk/_new 2014-09-08 21:30:08.000000000 +0200 @@ -27,10 +27,13 @@ Url: http://goodies.xfce.org/projects/applications/xfce4-power-manager Source0: %{name}-%{version}.tar.bz2 Source1: xfce4-power-manager.xml +# PATCH-FIX-UPSTREAM xfce4-power-manager-lxpanel-0.7-support.patch bxo#11108 gber(a)opensuse.org -- Add support for lxpanel >= 0.7 +Patch0: xfce4-power-manager-lxpanel-0.7-support.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: libxslt-tools BuildRequires: update-desktop-files +BuildRequires: xfce4-dev-tools BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(glib-2.0) @@ -43,9 +46,7 @@ BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfce4util-1.0) BuildRequires: pkgconfig(libxfconf-0) -%if 0 BuildRequires: pkgconfig(lxpanel) -%endif BuildRequires: pkgconfig(polkit-gobject-1) >= 0.100 BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(x11) @@ -84,7 +85,6 @@ This package provides a plugin for the Xfce panel for monitoring battery and device charge levels and to regulate display brightness. -%if 0 %package -n lxpanel-plugin-power-manager Summary: LXPanel Plugin for Monitoring Batteries and Changing the Display Brightness Group: System/GUI/LXDE @@ -96,7 +96,6 @@ %description -n lxpanel-plugin-power-manager This package provides a plugin for the LXDE panel for monitoring battery and device charge levels and to regulate display brightness. -%endif %package branding-upstream Summary: Upstream Branding of xfce4-power-manager @@ -115,6 +114,7 @@ %prep %setup -q +%patch0 -p1 # xfce4-pm-helper is only needed on non-systemd systems xsltproc --nonet - ./src/org.xfce.power.policy.in2 <<'EOF' \ @@ -137,6 +137,7 @@ EOF %build +xdt-autogen %configure make %{?_smp_mflags} V=1 @@ -150,9 +151,7 @@ %suse_update_desktop_file xfce4-power-manager rm %{buildroot}%{_libdir}/xfce4/panel/plugins/libxfce4powermanager.la -%if 0 rm %{buildroot}%{_libdir}/lxpanel/plugins/lxde_power_manager.la -%endif # xfce4-pm-helper is only needed on non-systemd systems rm %{buildroot}%{_sbindir}/xfce4-pm-helper @@ -192,11 +191,9 @@ %{_libdir}/xfce4/panel/plugins/libxfce4powermanager.so %{_datadir}/xfce4/panel-plugins/power-manager-plugin.desktop -%if 0 %files -n lxpanel-plugin-power-manager %defattr(-,root,root) %{_libdir}/lxpanel/plugins/lxde_power_manager.so -%endif %files branding-upstream %defattr(-,root,root) ++++++ xfce4-power-manager-lxpanel-0.7-support.patch ++++++ >From 06e525f797cc8104c77a59d5d9c62e27d7de9efc Mon Sep 17 00:00:00 2001 From: Eric Koegel <eric.koegel(a)gmail.com> Date: Sun, 7 Sep 2014 17:46:59 +0300 Subject: [PATCH] Add support for lxpanel 0.7+ (Bug 11108) The LXPanel plugin API was completely changed in version 0.7.0 without any module versioning or backwards compatibility. This patch make the plugin work with the new version while retaining the ability to still build for the old version (based on checking the package version at compile time). --- configure.ac | 10 ++- panel-plugins/power-manager-plugin/Makefile.am | 17 ++-- .../power-manager-plugin/lxde-0.7/Makefile.am | 56 +++++++++++++ .../lxde-0.7/lxde-power-manager-plugin.c | 93 ++++++++++++++++++++++ .../lxde/lxde-power-manager-plugin.c | 2 +- .../power-manager-plugin/power-manager-button.c | 13 ++- .../power-manager-plugin/power-manager-button.h | 2 +- po/POTFILES.in | 1 + 8 files changed, 177 insertions(+), 17 deletions(-) create mode 100644 panel-plugins/power-manager-plugin/lxde-0.7/Makefile.am create mode 100644 panel-plugins/power-manager-plugin/lxde-0.7/lxde-power-manager-plugin.c Index: xfce4-power-manager-1.3.2/configure.ac =================================================================== --- xfce4-power-manager-1.3.2.orig/configure.ac +++ xfce4-power-manager-1.3.2/configure.ac @@ -72,6 +72,7 @@ m4_define([xfconf_minimum_version], [4.1 m4_define([libxfce4ui_minimum_version],[4.10.0]) m4_define([libxfce4util_minimum_version],[4.10.0]) m4_define([libxfce4panel_minimum_version],[4.10.0]) +m4_define([lxdepanel_new_minimum_version],[0.7.0]) m4_define([lxdepanel_minimum_version],[0.5.6]) m4_define([libnotify_minimum_version], [0.4.1]) @@ -158,12 +159,16 @@ fi XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [libxfce4panel_minimum_version], [xfce4panel], [To build plugin support for Xfce's panel]) +XDT_CHECK_OPTIONAL_PACKAGE([LXDEPANEL_NEW], [lxpanel], [lxdepanel_new_minimum_version], +[lxdepanel],[To build plugin support for LXDE's panel]) + XDT_CHECK_OPTIONAL_PACKAGE([LXDEPANEL], [lxpanel], [lxdepanel_minimum_version], [lxdepanel],[To build plugin support for LXDE's panel]) AM_CONDITIONAL([BUILD_PANEL_PLUGINS], [test "x$build_panel_plugins" = "xyes"]) -AM_CONDITIONAL([BUILD_XFCE_PLUGINS], [test "x$LIBXFCE4PANEL_FOUND" = "xyes" && test "x$build_panel_plugins" = "xyes"]) -AM_CONDITIONAL([BUILD_LXDE_PLUGINS], [test "x$LXDEPANEL_FOUND" = "xyes" && test "x$build_panel_plugins" = "xyes"]) +AM_CONDITIONAL([BUILD_XFCE_PLUGIN], [test "x$LIBXFCE4PANEL_FOUND" = "xyes" && test "x$build_panel_plugins" = "xyes"]) +AM_CONDITIONAL([BUILD_LXDE_NEW_PLUGIN], [test "x$LXDEPANEL_NEW_FOUND" = "xyes" && test "x$build_panel_plugins" = "xyes"]) +AM_CONDITIONAL([BUILD_LXDE_OLD_PLUGIN], [test "x$LXDEPANEL_NEW_FOUND" != "xyes" && test "x$LXDEPANEL_FOUND" = "xyes" && test "x$build_panel_plugins" = "xyes"]) #=======================================================# @@ -219,6 +224,7 @@ src/Makefile settings/Makefile panel-plugins/Makefile panel-plugins/power-manager-plugin/Makefile +panel-plugins/power-manager-plugin/lxde-0.7/Makefile panel-plugins/power-manager-plugin/lxde/Makefile panel-plugins/power-manager-plugin/xfce/Makefile data/Makefile Index: xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/Makefile.am =================================================================== --- xfce4-power-manager-1.3.2.orig/panel-plugins/power-manager-plugin/Makefile.am +++ xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/Makefile.am @@ -1,12 +1,17 @@ -if BUILD_XFCE_PLUGINS +if BUILD_XFCE_PLUGIN xfce_dir = xfce endif -if BUILD_LXDE_PLUGINS -lxde_dir = lxde +if BUILD_LXDE_OLD_PLUGIN +lxde_old_dir = lxde endif -SUBDIRS = \ - $(xfce_dir) \ - $(lxde_dir) +if BUILD_LXDE_NEW_PLUGIN +lxde_new_dir = lxde-0.7 +endif + +SUBDIRS = \ + $(xfce_dir) \ + $(lxde_old_dir) \ + $(lxde_new_dir) Index: xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/lxde-0.7/Makefile.am =================================================================== --- /dev/null +++ xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/lxde-0.7/Makefile.am @@ -0,0 +1,56 @@ +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -DG_LOG_DOMAIN=\"lxde-power-manager-plugin\" \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + $(PLATFORM_CPPFLAGS) + + +# +# lxde power manager plugin +# + +plugin_LTLIBRARIES = \ + lxde_power_manager.la + +plugindir = \ + $(libdir)/lxpanel/plugins + +lxde_power_manager_la_SOURCES = \ + lxde-power-manager-plugin.c \ + ../power-manager-button.c \ + ../power-manager-button.h \ + ../scalemenuitem.c \ + ../scalemenuitem.h + +lxde_power_manager_la_CFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src \ + -DLOCALEDIR=\"$(localedir)\" \ + -DLXDE_PLUGIN \ + $(LXDEPANEL_CFLAGS) \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) \ + $(XFCONF_CFLAGS) \ + $(GTK_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(PLATFORM_CPPFLAGS) \ + $(PLATFORM_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(UPOWER_CFLAGS) + +lxde_power_manager_la_LDFLAGS = \ + -avoid-version \ + -module \ + -no-undefined \ + $(PLATFORM_LDFLAGS) + +lxde_power_manager_la_LIBADD = \ + $(top_builddir)/common/libxfpmcommon.la \ + $(LXDEPANEL_LIBS) \ + $(LIBXFCE4UI_LIBS) \ + $(LIBXFCE4UTIL_LIBS) \ + $(XFCONF_LIBS) \ + $(GTK_LIBS) \ + $(GLIB_LIBS) \ + $(DBUS_GLIB_LIBS) \ + $(UPOWER_LIBS) Index: xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/lxde-0.7/lxde-power-manager-plugin.c =================================================================== --- /dev/null +++ xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/lxde-0.7/lxde-power-manager-plugin.c @@ -0,0 +1,93 @@ +/* + * * Copyright (C) 2014 Eric Koegel <eric(a)xfce.org> + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include <gtk/gtk.h> +#include <glib.h> +#include <glib/gi18n-lib.h> + + +#include "../power-manager-button.h" + +/* plugin structure */ +typedef struct +{ + LXPanel *panel; + + /* panel widgets */ + GtkWidget *ebox; + GtkWidget *power_manager_button; +} +PowerManagerPlugin; + + +/* prototypes */ +static GtkWidget * power_manager_plugin_construct (LXPanel *panel, config_setting_t *settings); + +/* register the plugin */ +FM_DEFINE_MODULE(lxpanel_gtk, power_manager_plugin); + +/* Plugin descriptor. */ +LXPanelPluginInit fm_module_init_lxpanel_gtk = { + .name = N_("Power Manager Plugin"), + .description = N_("Display the battery levels of your devices and control the brightness of your display"), + .new_instance = power_manager_plugin_construct +}; + +static GtkWidget * +power_manager_plugin_new (LXPanel *panel) +{ + PowerManagerPlugin *power_manager_plugin; + + /* allocate memory for the plugin structure */ + power_manager_plugin = g_new0 (PowerManagerPlugin, 1); + + /* pointer to panel */ + power_manager_plugin->panel = panel; + + /* create a panel ebox */ + power_manager_plugin->ebox = gtk_event_box_new (); + gtk_widget_show (power_manager_plugin->ebox); + gtk_event_box_set_visible_window (GTK_EVENT_BOX(power_manager_plugin->ebox), FALSE); + + power_manager_plugin->power_manager_button = power_manager_button_new (); + power_manager_button_show(POWER_MANAGER_BUTTON(power_manager_plugin->power_manager_button)); + gtk_container_add (GTK_CONTAINER (power_manager_plugin->ebox), power_manager_plugin->power_manager_button); + + /* bind the plugin structure to the widget */ + lxpanel_plugin_set_data(power_manager_plugin->ebox, power_manager_plugin, g_free); + + return power_manager_plugin->ebox; +} + + +static GtkWidget * +power_manager_plugin_construct (LXPanel *panel, config_setting_t *settings) +{ + /* create the plugin */ + return power_manager_plugin_new (panel); +} Index: xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/lxde/lxde-power-manager-plugin.c =================================================================== --- xfce4-power-manager-1.3.2.orig/panel-plugins/power-manager-plugin/lxde/lxde-power-manager-plugin.c +++ xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/lxde/lxde-power-manager-plugin.c @@ -80,7 +80,7 @@ lxde_power_manager_plugin_new (Plugin *p gtk_widget_show (power_manager_plugin->ebox); gtk_event_box_set_visible_window (GTK_EVENT_BOX(power_manager_plugin->ebox), FALSE); - power_manager_plugin->power_manager_button = power_manager_button_new (plugin); + power_manager_plugin->power_manager_button = power_manager_button_new (); power_manager_button_show(POWER_MANAGER_BUTTON(power_manager_plugin->power_manager_button)); gtk_container_add (GTK_CONTAINER (power_manager_plugin->ebox), power_manager_plugin->power_manager_button); Index: xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/power-manager-button.c =================================================================== --- xfce4-power-manager-1.3.2.orig/panel-plugins/power-manager-plugin/power-manager-button.c +++ xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/power-manager-button.c @@ -54,9 +54,7 @@ struct PowerManagerButtonPrivate #ifdef XFCE_PLUGIN XfcePanelPlugin *plugin; #endif -#ifdef LXDE_PLUGIN - Plugin *plugin; -#endif + XfconfChannel *channel; UpClient *upower; @@ -592,7 +590,7 @@ GtkWidget * power_manager_button_new (XfcePanelPlugin *plugin) #endif #ifdef LXDE_PLUGIN -power_manager_button_new (Plugin *plugin) +power_manager_button_new (void) #endif { PowerManagerButton *button = NULL; @@ -601,9 +599,6 @@ power_manager_button_new (Plugin *plugin #ifdef XFCE_PLUGIN button->priv->plugin = XFCE_PANEL_PLUGIN (g_object_ref (plugin)); #endif -#ifdef LXDE_PLUGIN - button->priv->plugin = plugin; -#endif return GTK_WIDGET (button); } @@ -1051,7 +1046,11 @@ power_manager_button_show_menu (PowerMan #else NULL, #endif +#ifdef XFCE_PLUGIN button->priv->plugin, +#else + NULL, +#endif 0, gtk_get_current_event_time ()); } Index: xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/power-manager-button.h =================================================================== --- xfce4-power-manager-1.3.2.orig/panel-plugins/power-manager-plugin/power-manager-button.h +++ xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/power-manager-button.h @@ -57,7 +57,7 @@ GType power_manager_b GtkWidget *power_manager_button_new (XfcePanelPlugin *plugin); #endif #ifdef LXDE_PLUGIN -GtkWidget *power_manager_button_new (Plugin *plugin); +GtkWidget *power_manager_button_new (void); #endif void power_manager_button_show (PowerManagerButton *button); Index: xfce4-power-manager-1.3.2/po/POTFILES.in =================================================================== --- xfce4-power-manager-1.3.2.orig/po/POTFILES.in +++ xfce4-power-manager-1.3.2/po/POTFILES.in @@ -22,6 +22,7 @@ src/org.xfce.power.policy.in2 panel-plugins/power-manager-plugin/power-manager-button.c panel-plugins/power-manager-plugin/scalemenuitem.c panel-plugins/power-manager-plugin/lxde/lxde-power-manager-plugin.c +panel-plugins/power-manager-plugin/lxde-0.7/lxde-power-manager-plugin.c panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c panel-plugins/power-manager-plugin/xfce/power-manager-plugin.desktop.in.in data/appdata/xfce4-power-manager.appdata.xml.in -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gromacs for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package gromacs for openSUSE:Factory checked in at 2014-09-08 21:28:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gromacs (Old) and /work/SRC/openSUSE:Factory/.gromacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gromacs" Changes: -------- --- /work/SRC/openSUSE:Factory/gromacs/gromacs.changes 2014-02-11 11:19:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gromacs.new/gromacs.changes 2014-09-08 21:29:56.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Sep 6 16:16:42 UTC 2014 - junghans(a)votca.org + +- version bump to 5.0.1 +- Details: http://www.gromacs.org/About_Gromacs/Release_Notes/Versions_5.0.x + +------------------------------------------------------------------- @@ -9 +15 @@ -- version bumped to 4.5.6 +- version bumped to 4.6.5 Old: ---- gromacs-4.6.5.tar.gz manual-4.6.5.pdf regressiontests-4.6.5.tar.gz New: ---- gromacs-5.0.1.tar.gz manual-5.0.1.pdf regressiontests-5.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gromacs.spec ++++++ --- /var/tmp/diff_new_pack.LlPjZm/_old 2014-09-08 21:30:06.000000000 +0200 +++ /var/tmp/diff_new_pack.LlPjZm/_new 2014-09-08 21:30:06.000000000 +0200 @@ -16,7 +16,7 @@ # Name: gromacs -Version: 4.6.5 +Version: 5.0.1 Release: 0 Summary: Molecular Dynamics Package License: GPL-2.0+ @@ -24,8 +24,10 @@ Url: http://www.gromacs.org Source0: ftp://ftp.gromacs.org/pub/gromacs/gromacs-%{version}.tar.gz Source1: ftp://ftp.gromacs.org/pub/manual/manual-%{version}.pdf -Source2: https://gromacs.googlecode.com/files/regressiontests-%{version}.tar.gz -BuildRequires: cmake +Source2: http://gerrit.gromacs.org/download/regressiontests-%{version}.tar.gz + +BuildRequires: gcc-c++ +BuildRequires: cmake >= 2.8.8 BuildRequires: fdupes BuildRequires: openmpi-devel %if %{defined fedora} @@ -115,19 +117,24 @@ %endif mkdir nompi openmpi cd nompi +# note about rpath +# gromacs' cmake has too rpath much auto-magin, just +# force to skip it (CMAKE_SKIP_RPATH=1) and use +# LD_LIBRARY_PATH for make check cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags} -fno-strict-aliasing" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ - -DCMAKE_SKIP_INSTALL_RPATH=ON \ - -DGMX_CPU_ACCELERATION=%{acce} \ + -DCMAKE_SKIP_RPATH=1 \ + -DGMX_SIMD=%{acce} \ -DGMX_MPI=OFF \ -DGMX_THREAD_MPI=ON \ + -DGMX_SYMLINK_OLD_BINARY_NAMES=OFF \ -DGMX_OPENMP=ON \ -DREGRESSIONTEST_PATH="$PWD/../regressiontests-%{version}" \ - -DGMXLIB=%{_lib} \ + -DGMX_LIB_INSTALL_DIR=%{_lib} \ .. make %{?_smp_mflags} cd ../openmpi @@ -142,26 +149,27 @@ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags} -fno-strict-aliasing" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ -DCMAKE_SKIP_RPATH=1 \ - -DGMX_CPU_ACCELERATION=%{acce} \ + -DGMX_SIMD=%{acce} \ + -DGMX_BUILD_MDRUN_ONLY=ON \ -DGMX_MPI=ON \ + -DGMX_SYMLINK_OLD_BINARY_NAMES=OFF \ -DGMX_OPENMP=ON \ - -DGMXLIB=%{_lib} \ + -DGMX_LIB_INSTALL_DIR=%{_lib} \ .. -#only mdrun uses mpi, change for gromacs>=5.0 -make %{?_smp_mflags} mdrun +make %{?_smp_mflags} %install make -C nompi install DESTDIR=%{buildroot} -make -C openmpi install-mdrun DESTDIR=%{buildroot} +make -C openmpi install DESTDIR=%{buildroot} %fdupes %{buildroot}%{_prefix} #not need when installed in /usr rm -f %{buildroot}%{_bindir}/GMXRC* # Move bash completion file to correct location mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d -cp %{buildroot}%{_bindir}/completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/gromacs -#TODO make a csh and zsh completion in the future maybe -rm -f %{buildroot}%{_bindir}/completion.* +#concatenate all gmx-completion*, starting with gmx-completion.bash (fct defs) +cat %{buildroot}%{_bindir}/gmx-completion{,?*}.bash > %{buildroot}%{_sysconfdir}/bash_completion.d/gromacs +rm -f %{buildroot}%{_bindir}/gmx-completion* cp %{S:1} %{buildroot}%{_datadir}/gromacs @@ -169,12 +177,10 @@ %if %{defined fedora} %{_openmpi_unload} %endif -make -C nompi check +LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make -C nompi %{?_smp_mflags} check %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%post openmpi -p /sbin/ldconfig -%postun openmpi -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -185,7 +191,6 @@ %exclude %{_datadir}/gromacs/template %exclude %{_datadir}/gromacs/*.pdf %{_libdir}/lib*.so.* -%exclude %{_libdir}/lib*_mpi.so.* %{_mandir}/man1/* %{_mandir}/man7/* @@ -197,7 +202,6 @@ %files openmpi %defattr(-,root,root,-) %{_bindir}/*_mpi -%{_libdir}/lib*_mpi.so.* %files devel %defattr(-,root,root) @@ -209,3 +213,5 @@ %files bash %defattr(-,root,root,-) %config %{_sysconfdir}/bash_completion.d/gromacs + +%changelog ++++++ gromacs-4.6.5.tar.gz -> gromacs-5.0.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/gromacs/gromacs-4.6.5.tar.gz /work/SRC/openSUSE:Factory/.gromacs.new/gromacs-5.0.1.tar.gz differ: char 5, line 1 ++++++ manual-4.6.5.pdf -> manual-5.0.1.pdf ++++++ (binary differes) ++++++ regressiontests-4.6.5.tar.gz -> regressiontests-5.0.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/gromacs/regressiontests-4.6.5.tar.gz /work/SRC/openSUSE:Factory/.gromacs.new/regressiontests-5.0.1.tar.gz differ: char 13, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Herwig++ for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package Herwig++ for openSUSE:Factory checked in at 2014-09-08 21:28:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Herwig++ (Old) and /work/SRC/openSUSE:Factory/.Herwig++.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Herwig++" Changes: -------- --- /work/SRC/openSUSE:Factory/Herwig++/Herwig++.changes 2014-08-25 11:04:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Herwig++.new/Herwig++.changes 2014-09-08 21:29:49.000000000 +0200 @@ -1,0 +2,26 @@ +Thu Sep 4 23:25:22 UTC 2014 - badshah400(a)gmail.com + +- Update to version 2.7.1: + + New shower switches to select schemes for momentum + reconstruction + + Bug-fixes: + - Ticket #378: Hadronization of baryon number violating + clusters involving diquarks; fixed by only considering + non-diquarks to be combined in the ClusterFinder. + - UFO converter can now parse SLHA files for parameter + settings + - Fix for systems using lib64: The repository is now + initialized correctly on systems using lib64 as the library + location + - Efficiency optimization: Better allocation of internal + vector variables for a noticeable speed increase of + 10-20% with LHC events +- Now depends on ThePEG >= 1.9.2 +- Add python build dependency since this is now required to build + the binary ufo2herwig +- New binary slha2herwig +- Drop patch Herwig++-fix-hepanalysis-check.patch: properly + implemented by upstream +- Rebase Herwig++-ThePEG-lib64.patch for new version. + +------------------------------------------------------------------- Old: ---- Herwig++-2.7.0.tar.bz2 Herwig++-fix-hepanalysis-check.patch New: ---- Herwig++-2.7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Herwig++.spec ++++++ --- /var/tmp/diff_new_pack.jZ8WS2/_old 2014-09-08 21:29:51.000000000 +0200 +++ /var/tmp/diff_new_pack.jZ8WS2/_new 2014-09-08 21:29:51.000000000 +0200 @@ -19,20 +19,18 @@ %define so_name libHerWig++ Name: Herwig++ -Version: 2.7.0 +Version: 2.7.1 Release: 0 Summary: A particle physics event generator, written in C++ License: GPL-2.0 Group: Development/Libraries/C and C++ Url: http://herwig.hepforge.org/ Source: http://www.hepforge.org/archive/herwig/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM Herwig++-fix-hepanalysis-check.patch badshah400(a)gmail.com -- Fix location for checking for HepAnalysis.so for x86_64 arch -Patch0: Herwig++-fix-hepanalysis-check.patch Patch1: Herwig++-ThePEG-lib64.patch BuildRequires: HepMC-devel BuildRequires: LHAPDF-devel BuildRequires: Rivet-devel -BuildRequires: ThePEG-devel +BuildRequires: ThePEG-devel >= 1.9.2 # automake, autoconf and libtool BuildRequires introduced due to Patch0. BuildRequires: autoconf BuildRequires: automake @@ -44,6 +42,7 @@ BuildRequires: gcc-fortran BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: python-devel BuildRequires: pkgconfig(gsl) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -93,7 +92,6 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 %build @@ -114,6 +112,9 @@ %fdupes -s %{buildroot}%{_libdir}/%{name}/ +# REMOVE UNNECESSARY BACKUP FILE +rm %{buildroot}/%{_libdir}/Herwig++/python/ufo2peg/helpers.py.orig + %post -n %{so_name} /sbin/ldconfig @@ -132,6 +133,7 @@ %{_bindir}/Herwig++ %{_bindir}/herwig-config %{_bindir}/ufo2herwig +%{_bindir}/slha2herwig %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so %{_libdir}/%{name}/python/ ++++++ Herwig++-2.7.0.tar.bz2 -> Herwig++-2.7.1.tar.bz2 ++++++ ++++ 7403 lines of diff (skipped) ++++++ Herwig++-ThePEG-lib64.patch ++++++ --- /var/tmp/diff_new_pack.jZ8WS2/_old 2014-09-08 21:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.jZ8WS2/_new 2014-09-08 21:29:54.000000000 +0200 @@ -1,13 +1,13 @@ -Index: Herwig++-2.7.0/m4/herwig.m4 +Index: Herwig++-2.7.1/m4/herwig.m4 =================================================================== ---- Herwig++-2.7.0.orig/m4/herwig.m4 -+++ Herwig++-2.7.0/m4/herwig.m4 -@@ -69,7 +69,7 @@ THEPEGHASLHAPDF="no" - if test -e ${with_thepeg}/lib/ThePEG/ThePEGLHAPDF.so ; then - THEPEGHASLHAPDF="yes" - fi +--- Herwig++-2.7.1.orig/m4/herwig.m4 ++++ Herwig++-2.7.1/m4/herwig.m4 +@@ -67,7 +67,7 @@ fi + THEPEGPATH="${with_thepeg}" + + THEPEGLIBPATH="${with_thepeg}/lib/ThePEG" -if test "${host_cpu}" == "x86_64" -a -e ${with_thepeg}/lib64/ThePEG/libThePEG.so ; then +if test -e ${with_thepeg}/lib64/ThePEG/libThePEG.so ; then - THEPEGLDFLAGS="-L${with_thepeg}/lib64/ThePEG" - if test -e ${with_thepeg}/lib64/ThePEG/ThePEGLHAPDF.so ; then - THEPEGHASLHAPDF="yes" + THEPEGLIBPATH="${with_thepeg}/lib64/ThePEG" + 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 vim-plugins for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package vim-plugins for openSUSE:Factory checked in at 2014-09-08 21:28:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vim-plugins (Old) and /work/SRC/openSUSE:Factory/.vim-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vim-plugins" Changes: -------- --- /work/SRC/openSUSE:Factory/vim-plugins/vim-plugins.changes 2014-02-20 11:14:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vim-plugins.new/vim-plugins.changes 2014-09-08 21:29:47.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 2 12:32:39 UTC 2014 - coolo(a)suse.com + +- fix license for spdx 1.2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vim-plugins.spec ++++++ --- /var/tmp/diff_new_pack.HuOoPi/_old 2014-09-08 21:29:49.000000000 +0200 +++ /var/tmp/diff_new_pack.HuOoPi/_new 2014-09-08 21:29:49.000000000 +0200 @@ -101,7 +101,7 @@ Version: %align_version Release: 0 Summary: Plugin to produce aligned text, equations, declarations, etc -License: SUSE-Vim +License: Vim Group: Productivity/Text/Editors Requires: vim @@ -181,7 +181,7 @@ Version: %diffchanges_version Release: 0 Summary: Show changes since the last save -License: SUSE-Vim +License: Vim Group: Productivity/Text/Editors Requires: diffutils Requires: vim @@ -196,7 +196,7 @@ Version: %locateopen_version Release: 0 Summary: Edit file without entering the whole path -License: SUSE-Vim +License: Vim Group: Productivity/Text/Editors Requires: findutils-locate Requires: vim @@ -241,7 +241,7 @@ Version: %multiplesearch_version Release: 0 Summary: Display multiple searches at the same time -License: SUSE-Vim +License: Vim Group: Productivity/Text/Editors Requires: vim @@ -417,7 +417,7 @@ Version: %zoomwin_version Release: 0 Summary: Zoom in/out of windows (toggle between one window and multi-window) -License: SUSE-Vim +License: Vim Group: Productivity/Text/Editors Requires: vim @@ -432,7 +432,7 @@ Version: %latex_version Release: 0 Summary: A rich set of tools for editing LaTeX -License: SUSE-Vim +License: Vim Group: Productivity/Text/Editors Requires: texlive-latex Requires: vim @@ -526,7 +526,7 @@ Version: %rails_version Release: 0 Summary: Support for Ruby on Rails development -License: SUSE-Vim +License: Vim Group: Productivity/Text/Editors Requires: rubygem-rails -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit chromium for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2014-09-08 21:28:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium" Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2014-08-21 16:16:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2014-09-08 21:29:20.000000000 +0200 @@ -1,0 +2,43 @@ +Mon Sep 1 07:33:24 UTC 2014 - tittiatcoke(a)gmail.com + +- Switch to shared libraries as a global default. This hopefully + speeds up the builds a little and prevents out-of-memory on OBS +- Move the chrome sandbox binary to the main package and remove the + sub-package for it. This should resolve build issues when having + the debug flag on. + +------------------------------------------------------------------- +Sun Aug 31 00:39:34 UTC 2014 - josua.m(a)t-online.de + +- add toolchain_linux_arm +- disable NaCl on ARM because it doesn't build +- add arm-webrtc-fix.patch +- add chromium-arm-r0.patch +- add skia.patch +- build components as shared libaries on arm + +------------------------------------------------------------------- +Wed Aug 27 11:53:24 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to Chromium 37.0.2062.94 + Security Fixes (bnc#893720) + * CVE-2014-3176, CVE-2014-3177: A combination of bugs in V8, IPC, + sync, and extensions that can lead to remote code execution + outside of the sandbox. + * CVE-2014-3168: Use-after-free in SVG + * CVE-2014-3169: Use-after-free in DOM + * CVE-2014-3170: Extension permission dialog spoofing + * CVE-2014-3171: Use-after-free in bindings + * CVE-2014-3172: Issue related to extension debugging + * CVE-2014-3173: Uninitialized memory read in WebGL + * CVE-2014-3174: Uninitialized memory read in Web Audio + * CVE-2014-3175: Various fixes from internal audits, fuzzing + and other initiatives + and 41 more security fixes for which no description was given + +- Drop the following patches as they are no longer required: + * chromium-23.0.1245-no-test-sources.patch + * no-download-nacl.diff + * chromium-no-courgette.patch + +------------------------------------------------------------------- Old: ---- chromium-23.0.1245-no-test-sources.patch chromium-36.0.1985.143.tar.xz chromium-no-courgette.patch no-download-nacl.diff New: ---- arm-webrtc-fix.patch chromium-37.0.2062.94.tar.xz chromium-arm-r0.patch skia.patch toolchain_linux_arm.tar ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.GWy3oh/_old 2014-09-08 21:29:43.000000000 +0200 +++ /var/tmp/diff_new_pack.GWy3oh/_new 2014-09-08 21:29:43.000000000 +0200 @@ -20,7 +20,7 @@ %define chromium_system_libs 0 Name: chromium -Version: 36.0.1985.143 +Version: 37.0.2062.94 Release: 0 Summary: Google's opens source browser project License: BSD-3-Clause and LGPL-2.1+ @@ -28,7 +28,8 @@ Url: http://code.google.com/p/chromium/ Source0: http://gsdview.appspot.com/chromium-browser-official/%{name}-%{version}.tar… Source1: toolchain_linux_x86.tar.bz2 -Source2: %{name}-rpmlintrc +Source2: toolchain_linux_arm.tar +Source3: %{name}-rpmlintrc Source30: master_preferences Source31: default_bookmarks.html Source99: chrome-wrapper @@ -46,28 +47,27 @@ Obsoletes: chromium-browser < %{version} Conflicts: otherproviders(chromium-browser) # There is no v8 for ppc and thus chromium won't run on ppc. For aarch64 certain buildrequires are missing (e.g. valgrind) -ExcludeArch: aarch64 ppc ppc64 ppc64le armv7hl +ExcludeArch: aarch64 ppc ppc64 ppc64le ## Start Patches # Many changes to the gyp systems so we can use system libraries -# PATCH-FIX-OPENSUSE Test sources have been removed to shrink the tarball -Patch1: chromium-23.0.1245-no-test-sources.patch # PATCH-FIX-OPENSUSE Make the 1-click-install ymp file always download [bnc#836059] -Patch2: exclude_ymp.diff -# PATCH-FIX-OPENSUSE Disable the download of the NaCl tarballs -Patch3: no-download-nacl.diff -# PATCH-FIX-OPENSUSE removes build part for courgette -Patch13: chromium-no-courgette.patch +Patch1: exclude_ymp.diff # PATCH-FIX-OPENSUSE enables reading of the master preference -Patch14: chromium-master-prefs-path.patch +Patch4: chromium-master-prefs-path.patch # PATCH-FIX-OPENSUSE Fix some includes specifically for the GCC version used -Patch20: chromium-gcc-fixes.patch +Patch5: chromium-gcc-fixes.patch # PATCH-FIX-UPSTREAM Add more charset aliases -Patch64: chromium-more-codec-aliases.patch +Patch6: chromium-more-codec-aliases.patch # PATCH-FIX-OPENSUSE Compile the sandbox with -fPIE settings -Patch66: chromium-sandbox-pie.patch +Patch7: chromium-sandbox-pie.patch # PATCH-FIX-OPENSUSE Adjust ldflags for better building -Patch67: adjust-ldflags-no-keep-memory.patch +Patch8: adjust-ldflags-no-keep-memory.patch + +# archlinux arm enhancement patches +Patch100: arm-webrtc-fix.patch +Patch101: chromium-arm-r0.patch +Patch102: skia.patch BuildRequires: alsa-devel BuildRequires: bison @@ -93,9 +93,11 @@ BuildRequires: libgnome-keyring-devel BuildRequires: libicu-devel >= 4.0 BuildRequires: libpulse-devel + %if !0%{?packman_bs} BuildRequires: ninja %endif +BuildRequires: libdrm-devel BuildRequires: pam-devel BuildRequires: pciutils-devel BuildRequires: pkg-config @@ -113,6 +115,8 @@ BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libxslt) @@ -193,7 +197,8 @@ Requires(pre): permissions Recommends: Chromium-password = %{version} -Requires: %{name}-suid-helper = %{version} +Obsoletes: %{name}-suid-helper < %{version} +Provides: %{name}-suid-helper = %{version} # Recommends the chromium-ffmpeg library (available from packman) Recommends: chromium-ffmpeg @@ -243,24 +248,6 @@ Gnome's Keyring. Please be aware that by this change the old password are no longer accessible and are also not converted to Gnome's Keyring. -%package suid-helper - -Summary: A suid helper to let a process willingly drop privileges on Linux -License: BSD-3-Clause and LGPL-2.1+ -Group: Productivity/Networking/Web/Browsers -Url: http://code.google.com/p/setuid-sandbox/ -Requires(pre): permissions - -%description suid-helper -t will allow a process to execute a target executable that will be able to drop privileges: - - * The suid sandbox will create a new PID namespace or will switch uid/gid to isolate the process - * a helper process, sharing the filesystem view of the existing process, will be created. It - will accept a request to chroot() the process to an empty directory - -This is convenient because an executable can be launched, load libraries and open files and get -chroot()-ed to an empty directory when it wants to drop filesystem access. - %package -n chromedriver Summary: WebDriver for Google Chrome/Chromium @@ -287,22 +274,24 @@ %prep %if !0%{?packman_bs} -%setup -q -n %{name}-%{version} -a 999 -a 998 -a 1 +%setup -q -n %{name}-%{version} -a 999 -a 998 -a 997 -a 1 -a 2 %else %setup -q -n %{name}-%{version} -a 999 -a 998 -a 997 %endif %patch1 -p0 -%patch2 -p0 -%patch3 -p0 -%patch64 -p0 -%patch13 -p0 -%patch14 -p0 -%patch20 -p0 -%patch66 -p0 -%patch67 -p0 +%patch6 -p0 +%patch4 -p0 +%patch5 -p0 +%patch7 -p0 +%patch8 -p0 #Upstream fixes +# archlinux arm enhancements +%patch100 -p0 +%patch101 -p0 +%patch102 -p0 + export PATH="$PATH":`pwd`/depot_tools %if !0%{?packman_bs} @@ -325,7 +314,9 @@ -Dremove_webcore_debug_symbols=1 -Dlogging_like_official_build=1 -Dlinux_fpic=1 - -Ddisable_sse2=1" + -Ddisable_sse2=1 + -Dcomponent=shared_library + -Dtoolkit_uses_gtk=0" %if 0%{?packman_bs} myconf+=" -Dffmpeg_branding=Chrome" @@ -340,6 +331,15 @@ myconf+=" -Dtarget_arch=x64" %endif +%ifarch %arm +myconf+=" -Dtarget_arch=arm + -Dsysroot= + -Ddisable_nacl=1" +%endif +%ifarch armv6hl armv7hl +myconf+=" -Darm_float_abi=hard" +%endif + %if 0%{?chromium_system_libs} myconf+=" -Duse_system_flac=1 -Duse_system_speex=1 @@ -457,10 +457,16 @@ %fdupes %{buildroot}%{_mandir}/man1/ # NaCl +%ifnarch %arm cp -a nacl_helper %{buildroot}%{_libdir}/chromium/ cp -a nacl_helper_bootstrap %{buildroot}%{_libdir}/chromium/ cp -a nacl_irt_*.nexe %{buildroot}%{_libdir}/chromium/ cp -a libppGoogleNaClPluginChrome.so %{buildroot}%{_libdir}/chromium/ +%endif + + # chromium components + mkdir -p %{buildroot}%{_libdir}/chromium/lib/ + cp -av lib/*.so %{buildroot}%{_libdir}/chromium/lib/ #libffmpegsumo cp -a libffmpegsumo.so %{buildroot}%{_libdir}/chromium/ @@ -508,16 +514,14 @@ # Add snipplets to update the GTK cache on package install. -%verifyscript suid-helper +%verifyscript %verify_permissions -e %{_prefix}/lib/chrome_sandbox -%post suid-helper -%set_permissions %{_prefix}/lib/chrome_sandbox - %post %icon_theme_cache_post %desktop_database_post "%_sbindir/update-alternatives" --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-generic 10 +%set_permissions %{_prefix}/lib/chrome_sandbox %postun %icon_theme_cache_postun @@ -563,6 +567,7 @@ %files %defattr(-,root,root,-) +%verify(not mode) %{_prefix}/lib/chrome_sandbox %doc AUTHORS LICENSE %config %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/default/chromium @@ -573,11 +578,11 @@ %{_datadir}/applications/*.desktop %{_datadir}/gnome-control-center/default-apps/chromium-browser.xml %{_datadir}/icons/hicolor/ +%{_prefix}/lib/chrome_sandbox %exclude %{_libdir}/chromium/libffmpegsumo.so %exclude %{_libdir}/chromium/chromium-kde %exclude %{_libdir}/chromium/chromium-gnome %exclude %{_libdir}/chromium/chromedriver -%exclude %{_libdir}/chromium/chrome-sandbox %_bindir/chromium %ghost %_sysconfdir/alternatives/chromium @@ -591,11 +596,6 @@ %files desktop-gnome %attr(755, root, root) %{_libdir}/chromium/chromium-gnome -%files suid-helper -%defattr(-,root,root,-) -%verify(not mode) %{_prefix}/lib/chrome_sandbox -%{_libdir}/chromium/chrome-sandbox - %files -n chromedriver %defattr(-,root,root,-) %{_libdir}/chromium/chromedriver ++++++ arm-webrtc-fix.patch ++++++ --- third_party/webrtc/system_wrappers/source/cpu_features.cc.orig 2014-01-15 18:38:50.331954791 -0700 +++ third_party/webrtc/system_wrappers/source/cpu_features.cc 2014-01-15 18:38:37.902004379 -0700 @@ -18,6 +18,47 @@ #include "webrtc/typedefs.h" +#include <elf.h> +#ifdef __arm__ +#include <fcntl.h> +#include <unistd.h> +#include <linux/auxvec.h> +#include <asm/hwcap.h> +#endif + +#ifdef __arm__ +uint64_t WebRtc_GetCPUFeaturesARM() { + static bool detected = false; + static uint64_t have_neon = 0; + + int fd; + Elf32_auxv_t auxv; + unsigned int hwcaps; + + if (!detected) { + int fd; + Elf32_auxv_t auxv; + unsigned int hwcaps; + + fd = open("/proc/self/auxv", O_RDONLY); + if (fd >= 0) { + while (read(fd, &auxv, sizeof(Elf32_auxv_t)) == sizeof(Elf32_auxv_t)) { + if (auxv.a_type == AT_HWCAP) { + have_neon = (auxv.a_un.a_val & HWCAP_NEON) ? kCPUFeatureNEON : 0; + break; + } + } + close (fd); + } else { + have_neon = 0; + } + detected = true; + } + + return 0 | have_neon; // others here as we need them +} +#endif + // No CPU feature is available => straight C path. int GetCPUInfoNoASM(CPUFeature feature) { (void)feature; ++++++ chromium-36.0.1985.143.tar.xz -> chromium-37.0.2062.94.tar.xz ++++++ /work/SRC/openSUSE:Factory/chromium/chromium-36.0.1985.143.tar.xz /work/SRC/openSUSE:Factory/.chromium.new/chromium-37.0.2062.94.tar.xz differ: char 26, line 1 ++++++ chromium-arm-r0.patch ++++++ --- third_party/icu/icu.gyp.orig 2014-05-20 19:17:22.879538568 -0600 +++ third_party/icu/icu.gyp 2014-05-20 19:19:42.204032167 -0600 @@ -30,7 +30,7 @@ }], ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ - (target_arch=="arm" or target_arch=="ia32" or \ + (target_arch=="ia32" or \ target_arch=="mipsel")', { 'target_conditions': [ ['_toolset=="host"', { ++++++ skia.patch ++++++ --- skia/skia_library_opts.gyp.orig 2014-04-10 07:06:03.181637221 -0600 +++ skia/skia_library_opts.gyp 2014-04-10 07:06:55.256436603 -0600 @@ -123,6 +123,7 @@ '../third_party/skia/src/opts/SkMorphology_opts_arm.cpp', '../third_party/skia/src/opts/SkUtils_opts_arm.cpp', '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', + '../third_party/skia/src/opts/memset.arm.S', ], }], [ 'target_arch == "mipsel"',{ ++++++ toolchain_linux_x86.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/chromium/toolchain_linux_x86.tar.bz2 /work/SRC/openSUSE:Factory/.chromium.new/toolchain_linux_x86.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdump for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package kdump for openSUSE:Factory checked in at 2014-09-08 21:28:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdump (Old) and /work/SRC/openSUSE:Factory/.kdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdump" Changes: -------- --- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2014-09-04 07:55:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdump.new/kdump.changes 2014-09-08 21:29:10.000000000 +0200 @@ -1,0 +2,18 @@ +Mon Sep 8 15:36:29 UTC 2014 - ptesarik(a)suse.cz + +- kdump-count-const-slabs.patch: Take constant-size slabs into + account for "kdump calibrate" (bnc#879460). + +------------------------------------------------------------------- +Mon Sep 8 07:40:17 UTC 2014 - ptesarik(a)suse.cz + +- kdump-count-framebuffer.patch: Take framebuffer size into account + for "kdumptool calibrate" (bnc#879460). + +------------------------------------------------------------------- +Fri Sep 5 11:42:40 UTC 2014 - ptesarik(a)suse.cz + +- kdump-use-fstab-device.patch: Use device from /etc/fstab to mount + / and /boot (bnc#892451). + +------------------------------------------------------------------- New: ---- kdump-count-const-slabs.patch kdump-count-framebuffer.patch kdump-use-fstab-device.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdump.spec ++++++ --- /var/tmp/diff_new_pack.yxO28M/_old 2014-09-08 21:29:11.000000000 +0200 +++ /var/tmp/diff_new_pack.yxO28M/_new 2014-09-08 21:29:11.000000000 +0200 @@ -65,6 +65,9 @@ Source2: %{name}-rpmlintrc Source3: kdump.service Patch0: 0001-multipath-Write-proper-regex-into-multipath-conf.patch +Patch1: %{name}-use-fstab-device.patch +Patch2: %{name}-count-framebuffer.patch +Patch3: %{name}-count-const-slabs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2) Provides: kdump-helpers = %{version} @@ -103,6 +106,9 @@ %prep %setup %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build export CFLAGS="%optflags" ++++++ kdump-count-const-slabs.patch ++++++ From: Petr Tesarik <ptesarik(a)suse.cz> Date: Mon Sep 8 17:33:38 2014 +0200 Subject: Take constant-size slabs into account for "kdump calibrate" References: bnc#879460 Patch-mainline: v0.8.16 Git-commit: 3a7c9b3a02893ab9ac39e23cae5ead9e42716927 Some slabs do not depend on available memory or system utilization. Their size can be taken directly from the running kernel. Note that the size of the ACPI slab cache may vary widely across machines (e.g. mine has only a few hundred kilobytes, while another one I saw had over 10 megabytes). Signed-off-by: Petr Tesarik <ptesarik(a)suse.cz> --- kdumptool/calibrate.cc | 213 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 213 insertions(+) --- a/kdumptool/calibrate.cc +++ b/kdumptool/calibrate.cc @@ -448,6 +448,201 @@ unsigned long Framebuffers::size(void) c } //}}} +//{{{ SlabInfo ----------------------------------------------------------------- + +class SlabInfo { + + public: + /** + * Initialize a new SlabInfo object. + * + * @param[in] line Line from /proc/slabinfo + */ + SlabInfo(const KString &line); + + protected: + bool m_comment; + KString m_name; + unsigned long m_active_objs; + unsigned long m_num_objs; + unsigned long m_obj_size; + unsigned long m_obj_per_slab; + unsigned long m_pages_per_slab; + unsigned long m_active_slabs; + unsigned long m_num_slabs; + + public: + bool isComment(void) const + throw () + { return m_comment; } + + const KString &name(void) const + throw () + { return m_name; } + + unsigned long activeObjs(void) const + throw () + { return m_active_objs; } + + unsigned long numObjs(void) const + throw () + { return m_num_objs; } + + unsigned long objSize(void) const + throw () + { return m_obj_size; } + + unsigned long objPerSlab(void) const + throw () + { return m_obj_per_slab; } + + unsigned long pagesPerSlab(void) const + throw () + { return m_pages_per_slab; } + + unsigned long activeSlabs(void) const + throw () + { return m_active_slabs; } + + unsigned long numSlabs(void) const + throw () + { return m_num_slabs; } +}; + +// ----------------------------------------------------------------------------- +SlabInfo::SlabInfo(const KString &line) +{ + static const char slabdata_mark[] = " : slabdata "; + + std::istringstream ss(line); + ss >> m_name; + if (!ss) + throw KError("Invalid slabinfo line: " + line); + + if (m_name[0] == '#') { + m_comment = true; + return; + } + m_comment = false; + + ss >> m_active_objs >> m_num_objs >> m_obj_size + >> m_obj_per_slab >> m_pages_per_slab; + if (!ss) + throw KError("Invalid slabinfo line: " + line); + + size_t sdpos = line.find(slabdata_mark, ss.tellg()); + if (sdpos == KString::npos) + throw KError("Invalid slabinfo line: " + line); + + ss.seekg(sdpos + sizeof(slabdata_mark) - 1, ss.beg); + ss >> m_active_slabs >> m_num_slabs; + if (!ss) + throw KError("Invalid slabinfo line: " + line); +} + +//}}} +//{{{ SlabInfos ---------------------------------------------------------------- + +// Taken from procps: +#define SLABINFO_LINE_LEN 2048 +#define SLABINFO_VER_LEN 100 + +class SlabInfos { + + public: + typedef std::map<KString, const SlabInfo*> Map; + + /** + * Initialize a new SlabInfos object. + * + * @param[in] procdir Mount point for procfs + */ + SlabInfos(const char *procdir = "/proc") + throw () + : m_path(FilePath(procdir).appendPath("slabinfo")) + {} + + ~SlabInfos() + { destroyInfo(); } + + protected: + /** + * Path to the slabinfo file + */ + const FilePath m_path; + + /** + * SlabInfo for each slab + */ + Map m_info; + + private: + /** + * Destroy SlabInfo objects in m_info. + */ + void destroyInfo(void) + throw(); + + public: + /** + * Read the information about each slab. + */ + const Map& getInfo(void); +}; + +// ----------------------------------------------------------------------------- +void SlabInfos::destroyInfo(void) + throw() +{ + Map::iterator it; + for (it = m_info.begin(); it != m_info.end(); ++it) + delete it->second; + m_info.clear(); +} + +// ----------------------------------------------------------------------------- +const SlabInfos::Map& SlabInfos::getInfo(void) +{ + static const char verhdr[] = "slabinfo - version: "; + char buf[SLABINFO_VER_LEN], *p, *end; + unsigned long major, minor; + + std::ifstream f(m_path.c_str()); + if (!f) + throw KError(m_path + ": Open failed"); + f.getline(buf, sizeof buf); + if (f.bad()) + throw KError(m_path + ": Read failed"); + else if (!f || strncmp(buf, verhdr, sizeof(verhdr)-1)) + throw KError(m_path + ": Invalid version"); + p = buf + sizeof(verhdr) - 1; + + major = strtoul(p, &end, 10); + if (end == p || *end != '.') + throw KError(m_path + ": Invalid version"); + p = end + 1; + minor = strtoul(p, &end, 10); + if (end == p || *end != '\0') + throw KError(m_path + ": Invalid version"); + Debug::debug()->dbg("Found slabinfo version %lu.%lu", major, minor); + + if (major != 2) + throw KError(m_path + ": Unsupported slabinfo version"); + + char line[SLABINFO_LINE_LEN]; + while(f.getline(line, SLABINFO_LINE_LEN)) { + SlabInfo *si = new SlabInfo(line); + if (si->isComment()) { + delete si; + continue; + } + m_info[si->name()] = si; + } + + return m_info; +} + +//}}} //{{{ Calibrate ---------------------------------------------------------------- // ----------------------------------------------------------------------------- @@ -498,6 +693,24 @@ void Calibrate::execute() required += DEF_FRAMEBUFFER_KB; } + // Add space for constant slabs + try { + SlabInfos slab; + SlabInfos::Map info = slab.getInfo(); + SlabInfos::Map::iterator it; + for (it = info.begin(); it != info.end(); ++it) { + if (it->first.startsWith("Acpi-") || + it->first.startsWith("ftrace_") ) { + unsigned long slabsize = it->second->numSlabs() * + it->second->pagesPerSlab() * pagesize / 1024; + Debug::debug()->dbg("Adding %ld KiB for %s slab cache", + slabsize, it->second->name().c_str()); + } + } + } catch (KError e) { + Debug::debug()->dbg("Cannot get slab sizes: %s", e.what()); + } + // Add memory based on CPU count unsigned long cpus; if (CAN_REDUCE_CPUS) { ++++++ kdump-count-framebuffer.patch ++++++ From: Petr Tesarik <ptesarik(a)suse.cz> Date: Mon Sep 8 09:28:04 2014 +0200 Subject: Take framebuffer size into account for "kdumptool calibrate" References: bnc#879460 Patch-mainline: v0.8.16 Git-commit: 77ad2fff73fc6dd2dd0615e56967721ba9b96d83 Git-commit: 7cd4e826671ded8fe36a4b4bdeef1223ce8397ca Depending on the resolution, framebuffer(s) may considerably influence kdump kernel requirements. Note that there is no framebuffer on z/Series, so after reading sysfs fails, the default size for s390(x) is zero. Signed-off-by: Petr Tesarik <ptesarik(a)suse.cz> --- kdumptool/calibrate.cc | 153 +++++++++++++++++++++++++++++++++++++++++++++++++ kdumptool/fileutil.cc | 2 kdumptool/fileutil.h | 2 3 files changed, 155 insertions(+), 2 deletions(-) --- a/kdumptool/fileutil.cc +++ b/kdumptool/fileutil.cc @@ -295,7 +295,7 @@ FilePath FilePath::getCanonicalPath(cons } // ----------------------------------------------------------------------------- -StringVector FilePath::listDir(const ListDirFilter &filter) +StringVector FilePath::listDir(const ListDirFilter &filter) const throw (KError) { StringVector v; --- a/kdumptool/fileutil.h +++ b/kdumptool/fileutil.h @@ -224,7 +224,7 @@ class FilePath : public KString { * list, @c false if all files should be included * @exception KError if something went wrong */ - StringVector listDir(const ListDirFilter &filter) + StringVector listDir(const ListDirFilter &filter) const throw (KError); /** --- a/kdumptool/calibrate.cc +++ b/kdumptool/calibrate.cc @@ -19,7 +19,10 @@ #include <iostream> #include <fstream> #include <cerrno> +#include <cstring> +#include <cstdlib> #include <unistd.h> +#include <dirent.h> #include "subcommand.h" #include "debug.h" @@ -173,6 +176,13 @@ static inline unsigned long s390x_align_ // Estimated non-changing dynamic data (sysfs, procfs, etc.) #define KERNEL_DYNAMIC_KB MB(4) +// Default framebuffer size: 1024x768 @ 32bpp, except on mainframe +#if defined(__s390__) || defined(__s390x__) +# define DEF_FRAMEBUFFER_KB 0 +#else +# define DEF_FRAMEBUFFER_KB (768UL*4) +#endif + // large hashes, default settings: -> per MiB // PID: sizeof(void*) for each 256 KiB 4 // Dentry cache: sizeof(void*) for each 8 KiB 128 @@ -303,6 +313,141 @@ unsigned long SystemCPU::count(const cha } //}}} +//{{{ Framebuffer -------------------------------------------------------------- + +class Framebuffer { + + public: + /** + * Initialize a new Framebuffer object. + * + * @param[in] fbpath Framebuffer sysfs directory path + */ + Framebuffer(const char *fbpath) + throw () + : m_dir(fbpath) + {} + + protected: + /** + * Path to the framebuffer device base directory + */ + const FilePath m_dir; + + public: + /** + * Get length of the framebuffer [in bytes]. + */ + unsigned long size(void) const; +}; + +// ----------------------------------------------------------------------------- +unsigned long Framebuffer::size(void) const +{ + FilePath fp; + std::ifstream f; + unsigned long width, height, stride; + char sep; + + fp.assign(m_dir); + fp.appendPath("virtual_size"); + f.open(fp.c_str()); + if (!f) + throw KError(fp + ": Open failed"); + f >> width >> sep >> height; + f.close(); + if (f.bad()) + throw KError(fp + ": Read failed"); + else if (!f || sep != ',') + throw KError(fp + ": Invalid content!"); + Debug::debug()->dbg("Framebuffer virtual size: %lux%lu", width, height); + + fp.assign(m_dir); + fp.appendPath("stride"); + f.open(fp.c_str()); + if (!f) + throw KError(fp + ": Open failed"); + f >> stride; + f.close(); + if (f.bad()) + throw KError(fp + ": Read failed"); + else if (!f || sep != ',') + throw KError(fp + ": Invalid content!"); + Debug::debug()->dbg("Framebuffer stride: %lu bytes", stride); + + return stride * height; +} + +//}}} +//{{{ Framebuffers ------------------------------------------------------------- + +class Framebuffers { + + public: + /** + * Initialize a new Framebuffer object. + * + * @param[in] sysdir Mount point for sysfs + */ + Framebuffers(const char *sysdir = "/sys") + throw () + : m_fbdir(FilePath(sysdir).appendPath("class/graphics")) + {} + + protected: + /** + * Path to the base directory with links to framebuffer devices + */ + const FilePath m_fbdir; + + /** + * Filter only valid framebuffer device name + */ + class DirFilter : public ListDirFilter { + + public: + virtual ~DirFilter() + {} + + bool test(const struct dirent *d) const + { + char *end; + if (strncmp(d->d_name, "fb", 2)) + return false; + strtoul(d->d_name + 2, &end, 10); + return (*end == '\0' && end != d->d_name + 2); + } + }; + + public: + /** + * Get size of all framebuffers [in bytes]. + */ + unsigned long size(void) const; +}; + +// ----------------------------------------------------------------------------- +unsigned long Framebuffers::size(void) const +{ + Debug::debug()->trace("Framebuffers::size()"); + + unsigned long ret = 0UL; + + StringVector v = m_fbdir.listDir(DirFilter()); + for (StringVector::const_iterator it = v.begin(); it != v.end(); ++it) { + Debug::debug()->dbg("Found framebuffer: %s", it->c_str()); + + FilePath fp(m_fbdir); + fp.appendPath(*it); + Framebuffer fb(fp.c_str()); + ret += fb.size(); + } + + Debug::debug()->dbg("Total size of all framebuffers: %lu bytes", ret); + return ret; +} + +//}}} //{{{ Calibrate ---------------------------------------------------------------- // ----------------------------------------------------------------------------- @@ -345,6 +490,14 @@ void Calibrate::execute() // Run-time kernel requirements required = KERNEL_KB + ramfs + KERNEL_DYNAMIC_KB; + try { + Framebuffers fb; + required += fb.size() / 1024UL; + } catch(KError e) { + Debug::debug()->dbg("Cannot get framebuffer size: %s", e.what()); + required += DEF_FRAMEBUFFER_KB; + } + // Add memory based on CPU count unsigned long cpus; if (CAN_REDUCE_CPUS) { ++++++ kdump-use-fstab-device.patch ++++++ From: Petr Tesarik <ptesarik(a)suse.cz> Date: Fri Sep 5 12:26:36 2014 +0200 Subject: Use device from /etc/fstab to mount / and /boot References: bnc#892451 Patch-mainline: v0.8.16 Git-commit: 2895d4a8d24dd9b0a83e64cd58e464a3eaf7fe96 Since kdump_read_mounts() falls back to /proc/mounts, the root/boot mount points must not be changed if they were found in /etc/fstab previously. Signed-off-by: Petr Tesarik <ptesarik(a)suse.cz> diff --git a/init/setup-kdump.functions b/init/setup-kdump.functions index a676a82..2b96f8e 100644 --- a/init/setup-kdump.functions +++ b/init/setup-kdump.functions @@ -388,12 +388,14 @@ function kdump_get_mountpoints() # {{{ kdump_opts=( ) while read device mountpoint filesystem opts dummy ; do - if [ "$mountpoint" = "/" ] ; then + if [ "$mountpoint" = "/" -a \ + -z "$rootmnt" ] ; then rootdev="$device" rootmnt="$mountpoint" rootfstype="$filesystem" rootopts="$opts" - elif [ "$mountpoint" = "/boot" ] ; then + elif [ "$mountpoint" = "/boot" -a \ + -z "$bootmnt" ] ; then bootdev="$device" bootmnt="$mountpoint" bootfstype="$filesystem" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qttranslations for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package libqt5-qttranslations for openSUSE:Factory checked in at 2014-09-08 21:28:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qttranslations (Old) and /work/SRC/openSUSE:Factory/.libqt5-qttranslations.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qttranslations" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qttranslations/libqt5-qttranslations.changes 2014-06-30 21:50:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qttranslations.new/libqt5-qttranslations.changes 2014-09-08 21:29:08.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 5.3.2~git20140904 (rb9a22c9): + * Tip of the bugfix 5.3.2 branch: + * Update Czech translation + * Update German translations + * Bump version + +------------------------------------------------------------------- Old: ---- qttranslations-opensource-src-5.3.1.tar.xz New: ---- qttranslations-opensource-src-5.3.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qttranslations.spec ++++++ --- /var/tmp/diff_new_pack.YGgUmk/_old 2014-09-08 21:29:09.000000000 +0200 +++ /var/tmp/diff_new_pack.YGgUmk/_new 2014-09-08 21:29:09.000000000 +0200 @@ -16,19 +16,25 @@ # +%define qt5_snapshot 1 + Name: libqt5-qttranslations -Version: 5.3.1 +Version: 5.3.2~git20140904 Release: 0 Summary: Qt 5 Graphical Effects License: BSD-3-Clause and (SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0) Group: Development/Libraries/X11 Url: http://qt.digia.com %define base_name libqt5 -%define real_version 5.3.1 -%define so_version 5.3.1 +%define real_version 5.3.2 +%define so_version 5.3.2 %define tar_version qttranslations-opensource-src-%{real_version} Source: %{tar_version}.tar.xz BuildRequires: libqt5-qttools-devel >= %{version} +%if %qt5_snapshot +#to create the forwarding headers +BuildRequires: perl +%endif BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,6 +49,10 @@ %setup -q -n qttranslations-opensource-src-%{real_version} %build +%if %qt5_snapshot +#force the configure script to generate the forwarding headers (it checks whether .git directory exists) +mkdir .git +%endif %qmake5 %make_jobs ++++++ qttranslations-opensource-src-5.3.1.tar.xz -> qttranslations-opensource-src-5.3.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.1/.qmake.conf new/qttranslations-opensource-src-5.3.2/.qmake.conf --- old/qttranslations-opensource-src-5.3.1/.qmake.conf 2014-06-19 12:08:10.000000000 +0200 +++ new/qttranslations-opensource-src-5.3.2/.qmake.conf 2014-08-01 12:13:28.000000000 +0200 @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.3.1 +MODULE_VERSION = 5.3.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.1/.tag new/qttranslations-opensource-src-5.3.2/.tag --- old/qttranslations-opensource-src-5.3.1/.tag 2014-06-19 12:08:10.000000000 +0200 +++ new/qttranslations-opensource-src-5.3.2/.tag 2014-08-01 12:13:28.000000000 +0200 @@ -1 +1 @@ -ed43bd824d647605e8ffa482dbf034eae5de7bc4 +b9a22c997c1a988ff8e6b52893e4673e9ac69a2b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.1/translations/README new/qttranslations-opensource-src-5.3.2/translations/README --- old/qttranslations-opensource-src-5.3.1/translations/README 2014-06-19 12:08:10.000000000 +0200 +++ new/qttranslations-opensource-src-5.3.2/translations/README 2014-08-01 12:13:28.000000000 +0200 @@ -1,4 +1,6 @@ -The French, German, and Simplified Chinese translation files are -supported by Qt. All other translations are contributed by -third parties. These are provided without guarantees and may -disappear from future Qt releases. +All translations are contributed by the Qt community. +They are provided without guarantees, will often be stale, and may even +disappear entirely from future Qt releases. + +See http://qt-project.org/wiki/Qt-Localization for information on how to +contribute translations. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.1/translations/linguist_cs.ts new/qttranslations-opensource-src-5.3.2/translations/linguist_cs.ts --- old/qttranslations-opensource-src-5.3.1/translations/linguist_cs.ts 2014-06-19 12:08:10.000000000 +0200 +++ new/qttranslations-opensource-src-5.3.2/translations/linguist_cs.ts 2014-08-01 12:13:28.000000000 +0200 @@ -234,6 +234,14 @@ <comment>Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog</comment> <translation></translation> </message> + <message> + <source>Obsoleted messages are skipped when checked.</source> + <translation>Zastaralé zprávy jsou přeskočeny, když zaškrtnuto.</translation> + </message> + <message> + <source>Skip &obsolete</source> + <translation>Přeskočit &zastaralé</translation> + </message> </context> <context> <name>FormMultiWidget</name> @@ -2309,6 +2317,14 @@ <source>Display information about the Qt toolkit by Digia.</source> <translation>Zobrazit informace o sadě nástrojů Qt od firmy Digia.</translation> </message> + <message> + <source>Visualize whitespace</source> + <translation>Zviditelnit bílé znaky</translation> + </message> + <message> + <source>Toggle visualize whitespace in editors</source> + <translation>Přepnout zviditelnění bílých znaků v editorech</translation> + </message> </context> <context> <name>MessageEditor</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.1/translations/qt_help_cs.ts new/qttranslations-opensource-src-5.3.2/translations/qt_help_cs.ts --- old/qttranslations-opensource-src-5.3.1/translations/qt_help_cs.ts 2014-06-19 12:08:10.000000000 +0200 +++ new/qttranslations-opensource-src-5.3.2/translations/qt_help_cs.ts 2014-08-01 12:13:28.000000000 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="cs_CZ"> +<TS version="2.1" language="cs_CZ"> <context> <name>QCLuceneResultWidget</name> <message> @@ -227,6 +227,10 @@ <translation>Neznámý symbol.</translation> </message> <message> + <source>Unknown token in file "%1".</source> + <translation>Neznámý symbol v souboru "%1".</translation> + </message> + <message> <source>Unknown token. Expected "QtHelpProject"!</source> <translation>Neznámý symbol. Byl očekáván "QtHelpProject"!</translation> </message> @@ -235,6 +239,22 @@ <translation>Chyba na řádku %1: %2</translation> </message> <message> + <source>Virtual folder has invalid syntax in file: "%1"</source> + <translation>Virtuální složka má neplatný obsah v souboru: "%1"</translation> + </message> + <message> + <source>Namespace "%1" has invalid syntax in file: "%2"</source> + <translation>Jmenný prostor "%1" má neplatný obsah v souboru: "%2"</translation> + </message> + <message> + <source>Missing namespace in QtHelpProject file: "%1"</source> + <translation>Chybějící jmenný prostor v souboru QtHelpProject: "%1"</translation> + </message> + <message> + <source>Missing virtual folder in QtHelpProject file: "%1"</source> + <translation>Chybějící virtuální složka v souboru QtHelpProject: "%1"</translation> + </message> + <message> <source>Virtual folder has invalid syntax.</source> <translation>Virtuální složka má neplatnou skladbu.</translation> </message> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.1/translations/qt_help_de.ts new/qttranslations-opensource-src-5.3.2/translations/qt_help_de.ts --- old/qttranslations-opensource-src-5.3.1/translations/qt_help_de.ts 2014-06-19 12:08:10.000000000 +0200 +++ new/qttranslations-opensource-src-5.3.2/translations/qt_help_de.ts 2014-08-01 12:13:28.000000000 +0200 @@ -12,7 +12,7 @@ <translation>Achtung:</translation> </message> <message> - <source>The search results may not be complete since the documentation is still being indexed!</source> + <source>The search results may not be complete since the documentation is still being indexed.</source> <translation>Es können nicht alle möglichen Ergebnisse angezeigt werden, da die Dokumentation noch indiziert wird.</translation> </message> <message> @@ -34,64 +34,64 @@ <context> <name>QHelpCollectionHandler</name> <message> - <source>The collection file '%1' is not set up yet!</source> - <translation>Die Katalogdatei '%1' ist noch nicht eingerichtet.</translation> + <source>Cannot open collection file: %1</source> + <translation>Katalogdatei kann nicht geöffnet werden: %1</translation> </message> <message> - <source>Cannot load sqlite database driver!</source> - <translation>Der Datenbanktreiber für SQLite kann nicht geladen werden.</translation> + <source>The collection file '%1' is not set up yet.</source> + <translation>Die Katalogdatei '%1' ist noch nicht eingerichtet.</translation> </message> <message> - <source>Cannot open collection file: %1</source> - <translation>Katalogdatei kann nicht geöffnet werden: %1</translation> + <source>Cannot load sqlite database driver.</source> + <translation>Der Datenbanktreiber für SQLite kann nicht geladen werden.</translation> </message> <message> - <source>Cannot create tables in file %1!</source> + <source>Cannot create tables in file %1.</source> <translation>In Datei %1 können keine Tabellen angelegt werden.</translation> </message> <message> - <source>The collection file '%1' already exists!</source> + <source>The collection file '%1' already exists.</source> <translation>Die Katalogdatei '%1' existiert bereits.</translation> </message> <message> - <source>Unknown filter '%1'!</source> - <translation>Unbekannter Filter '%1'.</translation> + <source>Cannot create directory: %1</source> + <translation>Das Verzeichnis kann nicht angelegt werden: %1</translation> </message> <message> - <source>Invalid documentation file '%1'!</source> - <translation>Ungültige Dokumentationsdatei '%1'.</translation> + <source>Cannot copy collection file: %1</source> + <translation>Die Katalogdatei kann nicht kopiert werden: %1</translation> </message> <message> - <source>Cannot register namespace '%1'!</source> - <translation>Der Namensraum '%1' kann nicht registriert werden.</translation> + <source>Unknown filter '%1'.</source> + <translation>Unbekannter Filter '%1'.</translation> </message> <message> - <source>Cannot open database '%1' to optimize!</source> - <translation>Die Datenbank '%1' kann nicht zur Optimierung geöffnet werden.</translation> + <source>Cannot register filter %1.</source> + <translation>Der Filter %1 kann nicht registriert werden.</translation> </message> <message> - <source>Cannot create directory: %1</source> - <translation>Das Verzeichnis kann nicht angelegt werden: %1</translation> + <source>Cannot open documentation file %1.</source> + <translation>Die Dokumentationsdatei %1 kann nicht geöffnet werden.</translation> </message> <message> - <source>Cannot copy collection file: %1</source> - <translation>Die Katalogdatei kann nicht kopiert werden: %1</translation> + <source>Invalid documentation file '%1'.</source> + <translation>Ungültige Dokumentationsdatei '%1'.</translation> </message> <message> - <source>Cannot register filter %1!</source> - <translation>Der Filter kann nicht registriert werden: %1</translation> + <source>The namespace %1 was not registered.</source> + <translation>Der Namensraum %1 wurde nicht registriert.</translation> </message> <message> - <source>Cannot open documentation file %1!</source> - <translation>Die Dokumentationsdatei kann nicht geöffnet werden: %1</translation> + <source>Namespace %1 already exists.</source> + <translation>Der Namensraum %1 existiert bereits.</translation> </message> <message> - <source>The namespace %1 was not registered!</source> - <translation>Der Namensraum %1 wurde nicht registriert.</translation> + <source>Cannot register namespace '%1'.</source> + <translation>Der Namensraum '%1' kann nicht registriert werden.</translation> </message> <message> - <source>Namespace %1 already exists!</source> - <translation>Der Namensraum %1 existiert bereits.</translation> + <source>Cannot open database '%1' to optimize.</source> + <translation>Die Datenbank '%1' kann nicht zur Optimierung geöffnet werden.</translation> </message> </context> <context> @@ -105,98 +105,98 @@ <context> <name>QHelpEngineCore</name> <message> - <source>Cannot open documentation file %1: %2!</source> - <translation>Die Dokumentationsdatei %1 kann nicht geöffnet werden: %2!</translation> + <source>Cannot open documentation file %1: %2.</source> + <translation>Die Dokumentationsdatei %1 kann nicht geöffnet werden: %2.</translation> </message> <message> - <source>The specified namespace does not exist!</source> + <source>The specified namespace does not exist.</source> <translation>Der angegebene Namensraum existiert nicht.</translation> </message> </context> <context> <name>QHelpGenerator</name> <message> - <source>Invalid help data!</source> - <translation>Ungültige Hilfe-Daten.</translation> + <source>Building up file structure...</source> + <translation>Dateistruktur wird erzeugt...</translation> </message> <message> - <source>No output file name specified!</source> - <translation>Für die Ausgabe-Datei wurde kein Name angegeben.</translation> + <source>Insert custom filters...</source> + <translation>Benutzerdefinierte Filter einfügen...</translation> </message> <message> - <source>Building up file structure...</source> - <translation>Dateistruktur wird erzeugt...</translation> + <source>Insert help data for filter section (%1 of %2)...</source> + <translation>Hilfe-Daten für Filter-Sektion (%1 von %2) einfügen...</translation> </message> <message> - <source>The file %1 cannot be overwritten!</source> - <translation>Die Datei %1 kann nicht überschrieben werden.</translation> + <source>Documentation successfully generated.</source> + <translation>Dokumentation erfolgreich generiert.</translation> </message> <message> - <source>Cannot open data base file %1!</source> - <translation>Die Datenbank-Datei %1 kann nicht geöffnet werden.</translation> + <source>Insert files...</source> + <translation>Dateien einfügen...</translation> </message> <message> - <source>Cannot register namespace %1!</source> - <translation>Der Namensraum %1 kann nicht registriert werden.</translation> + <source>The file %1 does not exist! Skipping it.</source> + <translation>Die Datei %1 existiert nicht. Wird übersprungen.</translation> </message> <message> - <source>Insert custom filters...</source> - <translation>Benutzerdefinierte Filter einfügen...</translation> + <source>Cannot open file %1! Skipping it.</source> + <translation>Die Datei %1 kann nicht geöffnet werden. Wird übersprungen.</translation> </message> <message> - <source>Insert help data for filter section (%1 of %2)...</source> - <translation>Hilfe-Daten für Filter-Sektion (%1 von %2) einfügen...</translation> + <source>Insert indices...</source> + <translation>Indizes einfügen...</translation> </message> <message> - <source>Documentation successfully generated.</source> - <translation>Dokumentation erfolgreich generiert.</translation> + <source>Insert contents...</source> + <translation>Inhalt einfügen...</translation> </message> <message> - <source>Some tables already exist!</source> - <translation>Einige Tabellen existieren bereits.</translation> + <source>Invalid help data.</source> + <translation>Ungültige Hilfe-Daten.</translation> </message> <message> - <source>Cannot create tables!</source> - <translation>Tabellen können nicht erstellt werden.</translation> + <source>No output file name specified.</source> + <translation>Kein Name für die Ausgabe-Datei angegeben.</translation> </message> <message> - <source>Cannot register virtual folder!</source> - <translation>Virtueller Order kann nicht registriert werden.</translation> + <source>The file %1 cannot be overwritten.</source> + <translation>Die Datei %1 kann nicht überschrieben werden.</translation> </message> <message> - <source>Insert files...</source> - <translation>Dateien einfügen...</translation> + <source>Cannot open data base file %1.</source> + <translation>Die Datenbank-Datei %1 kann nicht geöffnet werden.</translation> </message> <message> - <source>The file %1 does not exist! Skipping it.</source> - <translation>Die Datei %1 existiert nicht. Wird übersprungen.</translation> + <source>Cannot register namespace %1.</source> + <translation>Der Namensraum %1 kann nicht registriert werden.</translation> </message> <message> - <source>Cannot open file %1! Skipping it.</source> - <translation>Die Datei %1 kann nicht geöffnet werden. Wird übersprungen.</translation> + <source>Some tables already exist.</source> + <translation>Einige Tabellen existieren bereits.</translation> </message> <message> - <source>The filter %1 is already registered!</source> - <translation>Der Filter %1 ist bereits registriert.</translation> + <source>Cannot create tables.</source> + <translation>Es können keine Tabellen erstellt werden.</translation> </message> <message> - <source>Cannot register filter %1!</source> - <translation>Der Filter %1 kann nicht registriert werden.</translation> + <source>Cannot register virtual folder.</source> + <translation>Virtueller Order kann nicht registriert werden.</translation> </message> <message> - <source>Insert indices...</source> - <translation>Indizes einfügen...</translation> + <source>The filter %1 is already registered.</source> + <translation>Der Filter %1 ist bereits registriert.</translation> </message> <message> - <source>Insert contents...</source> - <translation>Inhalt einfügen...</translation> + <source>Cannot register filter %1.</source> + <translation>Der Filter %1 kann nicht registriert werden.</translation> </message> <message> - <source>Cannot insert contents!</source> + <source>Cannot insert contents.</source> <translation>Inhalt kann nicht eingefügt werden.</translation> </message> <message> - <source>Cannot register contents!</source> + <source>Cannot register contents.</source> <translation>Inhalt kann nicht registriert werden.</translation> </message> <message> @@ -223,7 +223,7 @@ <translation>Unbekanntes Token in der Datei "%1".</translation> </message> <message> - <source>Unknown token. Expected "QtHelpProject"!</source> + <source>Unknown token. Expected "QtHelpProject".</source> <translation>Unbekanntes Token. "QtHelpProject" erwartet.</translation> </message> <message> @@ -247,8 +247,8 @@ <translation>Fehlender virtueller Ordner in der QtHelpProject-Datei: "%1"</translation> </message> <message> - <source>The input file %1 could not be opened!</source> - <translation>Die Eingabe-Datei %1 kann nicht geöffnet werden.</translation> + <source>The input file %1 could not be opened.</source> + <translation>Die Eingabe-Datei %1 konnte nicht geöffnet werden.</translation> </message> </context> <context> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.1/translations/qtbase_cs.ts new/qttranslations-opensource-src-5.3.2/translations/qtbase_cs.ts --- old/qttranslations-opensource-src-5.3.1/translations/qtbase_cs.ts 2014-06-19 12:08:10.000000000 +0200 +++ new/qttranslations-opensource-src-5.3.2/translations/qtbase_cs.ts 2014-08-01 12:13:28.000000000 +0200 @@ -63,7 +63,7 @@ </message> <message> <source>Trying to connect while connection is in progress</source> - <translation></translation> + <translation>Při navázaném spojení došlo k dalšímu pokusu o spojení</translation> </message> <message> <source>Socket is not connected</source> @@ -141,6 +141,25 @@ </message> </context> <context> + <name>QAndroidPlatformTheme</name> + <message> + <source>Yes</source> + <translation>Ano</translation> + </message> + <message> + <source>Yes to All</source> + <translation>Ano, vše</translation> + </message> + <message> + <source>No</source> + <translation>Ne</translation> + </message> + <message> + <source>No to All</source> + <translation>Ne, žádné</translation> + </message> +</context> +<context> <name>QApplication</name> <message> <source>Executable '%1' requires Qt %2, found Qt %3.</source> @@ -148,7 +167,7 @@ </message> <message> <source>Incompatible Qt Library Error</source> - <translation>Qt není slučitelná</translation> + <translation>Nekompatibilní knihovna Qt</translation> </message> </context> <context> @@ -210,6 +229,13 @@ </message> </context> <context> + <name>QCocoaTheme</name> + <message> + <source>Don't Save</source> + <translation>Neukládat</translation> + </message> +</context> +<context> <name>QColorDialog</name> <message> <source>Hu&e:</source> @@ -467,7 +493,7 @@ </message> <message> <source>Unable to rollback transaction</source> - <translation>Transakci se nepodařilo zvrátit</translation> + <translation>Transakci se nepodařilo vrátit</translation> </message> <message> <source>Unable to set autocommit</source> @@ -587,7 +613,7 @@ </message> <message> <source>Discard</source> - <translation>Odmítnout</translation> + <translation>Zahodit</translation> </message> <message> <source>&Yes</source> @@ -619,7 +645,7 @@ </message> <message> <source>Ignore</source> - <translation>Přehlížet</translation> + <translation>Ignorovat</translation> </message> <message> <source>Restore Defaults</source> @@ -677,6 +703,10 @@ <translation>Inicializace překladače adres se nezdařila</translation> </message> <message> + <source>IPv6 addresses for nameservers is currently not supported</source> + <translation>Adresy IPv6 pro DNS servery nejsou v současnosti podporovány</translation> + </message> + <message> <source>Server could not process query</source> <translation>Serveru se dotaz nepodařilo zpracovat</translation> </message> @@ -737,11 +767,20 @@ <source>Resolver library can't be loaded: No runtime library loading support</source> <translation>Knihovnu překladače adres nelze nahrát: Žádná podpora pro nahrání běhové knihovny</translation> </message> + <message> + <source>No hostname given</source> + <translation>Nebyl zadán název serveru</translation> + </message> + <message> + <source>Invalid hostname</source> + <translation>Neplatný název serveru</translation> + </message> </context> <context> <name>QDockWidget</name> <message> <source>Float</source> + <extracomment>Accessible name for button undocking a dock widget (floating state)</extracomment> <translation>Uvolnit</translation> </message> <message> @@ -750,6 +789,7 @@ </message> <message> <source>Close</source> + <extracomment>Accessible name for button closing a dock widget</extracomment> <translation>Zavřít</translation> </message> <message> @@ -1434,6 +1474,29 @@ </message> </context> <context> + <name>QGnomeTheme</name> + <message> + <source>&OK</source> + <translation>&OK</translation> + </message> + <message> + <source>&Save</source> + <translation>&Uložit</translation> + </message> + <message> + <source>&Cancel</source> + <translation>&Zrušit</translation> + </message> + <message> + <source>&Close</source> + <translation>&Zavřít</translation> + </message> + <message> + <source>Close without Saving</source> + <translation>Zavřít bez uložení</translation> + </message> +</context> +<context> <name>QHostInfo</name> <message> <source>No host name given</source> @@ -1561,7 +1624,7 @@ </message> <message> <source>Unable to rollback transaction</source> - <translation>Transakci se nepodařilo zvrátit</translation> + <translation>Transakci se nepodařilo vrátit</translation> </message> </context> <context> @@ -1657,6 +1720,10 @@ <source>Unknown error</source> <translation>Neznámá chyba</translation> </message> + <message> + <source>file to open is a directory</source> + <translation>Soubor k otevření je adresářem</translation> + </message> </context> <context> <name>QInputDialog</name> @@ -1948,7 +2015,7 @@ </message> <message> <source>Unable to rollback transaction</source> - <translation>Transakci se nepodařilo zvrátit</translation> + <translation>Transakci se nepodařilo vrátit</translation> </message> </context> <context> @@ -2411,7 +2478,7 @@ </message> <message> <source>Unable to rollback transaction</source> - <translation>Transakci se nepodařilo zvrátit</translation> + <translation>Transakci se nepodařilo vrátit</translation> </message> </context> <context> @@ -2469,7 +2536,7 @@ </message> <message> <source>Unable to rollback transaction</source> - <translation>Transakci se nepodařilo zvrátit</translation> + <translation>Transakci se nepodařilo vrátit</translation> </message> <message> <source>Unable to enable autocommit</source> @@ -2574,7 +2641,7 @@ </message> <message> <source>Could not rollback transaction</source> - <translation>Transakci se nepodařilo zvrátit</translation> + <translation>Transakci se nepodařilo vrátit</translation> </message> <message> <source>Unable to subscribe</source> @@ -2679,6 +2746,52 @@ <translation>Body (pt)</translation> </message> <message> + <source>Pica (P̸)</source> + <translation>Pica (P̸)</translation> + </message> + <message> + <source>Didot (DD)</source> + <translation>Didot (DD)</translation> + </message> + <message> + <source>Cicero (CC)</source> + <translation>Cicero (CC)</translation> + </message> + <message> + <source>Custom</source> + <translation>Stanovený uživatelem</translation> + </message> + <message> + <source>mm</source> + <extracomment>Unit 'Millimeter'</extracomment> + <translation>mm</translation> + </message> + <message> + <source>pt</source> + <extracomment>Unit 'Points'</extracomment> + <translation>pt</translation> + </message> + <message> + <source>in</source> + <extracomment>Unit 'Inch'</extracomment> + <translation>in</translation> + </message> + <message> + <source>P̸</source> + <extracomment>Unit 'Pica'</extracomment> + <translation>P̸</translation> + </message> + <message> + <source>DD</source> + <extracomment>Unit 'Didot'</extracomment> + <translation>DD</translation> + </message> + <message> + <source>CC</source> + <extracomment>Unit 'Cicero'</extracomment> + <translation>CC</translation> + </message> + <message> <source>Page Layout</source> <translation>Rozvržení stran</translation> </message> @@ -2692,6 +2805,559 @@ </message> </context> <context> + <name>QPageSize</name> + <message> + <source>Custom (%1mm x %2mm)</source> + <extracomment>Custom size name in millimeters</extracomment> + <translation>Vlastní (%1 mm x %2 mm)</translation> + </message> + <message> + <source>Custom (%1pt x %2pt)</source> + <extracomment>Custom size name in points</extracomment> + <translation>Vlastní (%1 pt x %2 pt)</translation> + </message> + <message> + <source>Custom (%1in x %2in)</source> + <extracomment>Custom size name in inches</extracomment> + <translation>Vlastní (%1 in x %2 in)</translation> + </message> + <message> + <source>Custom (%1pc x %2pc)</source> + <extracomment>Custom size name in picas</extracomment> + <translation>Vlastní (%1 pc x %2 pc)</translation> + </message> + <message> + <source>Custom (%1DD x %2DD)</source> + <extracomment>Custom size name in didots</extracomment> + <translation>Vlastní (%1 DD x %2 DD)</translation> + </message> + <message> + <source>Custom (%1CC x %2CC)</source> + <extracomment>Custom size name in ciceros</extracomment> + <translation>Vlastní (%1 CC x %2 CC)</translation> + </message> + <message> + <source>%1 x %2 in</source> + <extracomment>Page size in 'Inch'.</extracomment> + <translation>%1 x %2 in</translation> + </message> + <message> + <source>A0</source> + <translation>A0</translation> + </message> + <message> + <source>A1</source> + <translation>A1</translation> + </message> + <message> + <source>A2</source> + <translation>A2</translation> + </message> + <message> + <source>A3</source> + <translation>A3</translation> + </message> + <message> + <source>A4</source> + <translation>A4</translation> + </message> + <message> + <source>A5</source> + <translation>A5</translation> + </message> + <message> + <source>A6</source> + <translation>A6</translation> + </message> + <message> + <source>A7</source> + <translation>A7</translation> + </message> + <message> + <source>A8</source> + <translation>A8</translation> + </message> + <message> + <source>A9</source> + <translation>A9</translation> + </message> + <message> + <source>A10</source> + <translation>A10</translation> + </message> + <message> + <source>B0</source> + <translation>B0</translation> + </message> + <message> + <source>B1</source> + <translation>B1</translation> + </message> + <message> + <source>B2</source> + <translation>B2</translation> + </message> + <message> + <source>B3</source> + <translation>B3</translation> + </message> + <message> + <source>B4</source> + <translation>B4</translation> + </message> + <message> + <source>B5</source> + <translation>B5</translation> + </message> + <message> + <source>B6</source> + <translation>B6</translation> + </message> + <message> + <source>B7</source> + <translation>B7</translation> + </message> + <message> + <source>B8</source> + <translation>B8</translation> + </message> + <message> + <source>B9</source> + <translation>B9</translation> + </message> + <message> + <source>B10</source> + <translation>B10</translation> + </message> + <message> + <source>Executive (7.5 x 10 in)</source> + <translation>Executive (7.5 x 10 in)</translation> + </message> + <message> + <source>Executive (7.25 x 10.5 in)</source> + <translation>Executive (7.25 x 10.5 in)</translation> + </message> + <message> + <source>Folio (8.27 x 13 in)</source> + <translation>Folio (8.27 x 13 in)</translation> + </message> + <message> + <source>Legal</source> + <translation>US Legal</translation> + </message> + <message> + <source>Letter / ANSI A</source> + <translation>Letter / ANSI A</translation> + </message> + <message> + <source>Tabloid / ANSI B</source> + <translation>Tabloid / ANSI B</translation> + </message> + <message> + <source>Ledger / ANSI B</source> + <translation>Ledger / ANSI B</translation> + </message> + <message> + <source>Custom</source> + <translation>Vlastní</translation> + </message> + <message> + <source>A3 Extra</source> + <translation>A3 Extra</translation> + </message> + <message> + <source>A4 Extra</source> + <translation>A4 Extra</translation> + </message> + <message> + <source>A4 Plus</source> + <translation>A4 Plus</translation> + </message> + <message> + <source>A4 Small</source> + <translation>A4 malý</translation> + </message> + <message> + <source>A5 Extra</source> + <translation>A5 Extra</translation> + </message> + <message> + <source>B5 Extra</source> + <translation>B5 Extra</translation> + </message> + <message> + <source>JIS B0</source> + <translation>JIS B0</translation> + </message> + <message> + <source>JIS B1</source> + <translation>JIS B1</translation> + </message> + <message> + <source>JIS B2</source> + <translation>JIS B2</translation> + </message> + <message> + <source>JIS B3</source> + <translation>JIS B3</translation> + </message> + <message> + <source>JIS B4</source> + <translation>JIS B4</translation> + </message> + <message> + <source>JIS B5</source> + <translation>JIS B5</translation> + </message> + <message> + <source>JIS B6</source> + <translation>JIS B6</translation> + </message> + <message> + <source>JIS B7</source> + <translation>JIS B7</translation> + </message> + <message> + <source>JIS B8</source> + <translation>JIS B8</translation> + </message> + <message> + <source>JIS B9</source> + <translation>JIS B9</translation> + </message> + <message> + <source>JIS B10</source> + <translation>JIS B10</translation> + </message> + <message> + <source>ANSI C</source> + <translation>ANSI C</translation> + </message> + <message> + <source>ANSI D</source> + <translation>ANSI D</translation> + </message> + <message> + <source>ANSI E</source> + <translation>ANSI E</translation> + </message> + <message> + <source>Legal Extra</source> + <translation>Legal Extra</translation> + </message> + <message> + <source>Letter Extra</source> + <translation>Letter Extra</translation> + </message> + <message> + <source>Letter Plus</source> + <translation>Letter Plus</translation> + </message> + <message> + <source>Letter Small</source> + <translation>Letter malý</translation> + </message> + <message> + <source>Tabloid Extra</source> + <translation>Tabloid Extra</translation> + </message> + <message> + <source>Architect A</source> + <translation>Architect A</translation> + </message> + <message> + <source>Architect B</source> + <translation>Architect B</translation> + </message> + <message> + <source>Architect C</source> + <translation>Architect C</translation> + </message> + <message> + <source>Architect D</source> + <translation>Architect D</translation> + </message> + <message> + <source>Architect E</source> + <translation>Architect E</translation> + </message> + <message> + <source>Note</source> + <translation>Note</translation> + </message> + <message> + <source>Quarto</source> + <translation>Kvartový formát</translation> + </message> + <message> + <source>Statement</source> + <translation>Statement</translation> + </message> + <message> + <source>Super A</source> + <translation>Super A</translation> + </message> + <message> + <source>Super B</source> + <translation>Super B</translation> + </message> + <message> + <source>Postcard</source> + <translation>Korespondenční lístek</translation> + </message> + <message> + <source>Double Postcard</source> + <translation>Dvojitý korespondenční lístek</translation> + </message> + <message> + <source>PRC 16K</source> + <translation>PRC 16K</translation> + </message> + <message> + <source>PRC 32K</source> + <translation>PRC 32K</translation> + </message> + <message> + <source>PRC 32K Big</source> + <translation>PRC 32K velký</translation> + </message> + <message> + <source>Fan-fold US (14.875 x 11 in)</source> + <translation>Fan-fold US (14.875 x 11 in)</translation> + </message> + <message> + <source>Fan-fold German (8.5 x 12 in)</source> + <translation>Fan-fold německý (8.5 x 12 in)</translation> + </message> + <message> + <source>Fan-fold German Legal (8.5 x 13 in)</source> + <translation>Fan-fold německý Legal (8.5 x 13 in)</translation> + </message> + <message> + <source>Envelope B4</source> + <translation>Obálka B4</translation> + </message> + <message> + <source>Envelope B5</source> + <translation>Obálka B5</translation> + </message> + <message> + <source>Envelope B6</source> + <translation>Obálka B6</translation> + </message> + <message> + <source>Envelope C0</source> + <translation>Obálka C0</translation> + </message> + <message> + <source>Envelope C1</source> + <translation>Obálka C1</translation> + </message> + <message> + <source>Envelope C2</source> + <translation>Obálka C2</translation> + </message> + <message> + <source>Envelope C3</source> + <translation>Obálka C3</translation> + </message> + <message> + <source>Envelope C4</source> + <translation>Obálka C4</translation> + </message> + <message> + <source>Envelope C5</source> + <translation>Obálka C5</translation> + </message> + <message> + <source>Envelope C6</source> + <translation>Obálka C6</translation> + </message> + <message> + <source>Envelope C65</source> + <translation>Obálka C65</translation> + </message> + <message> + <source>Envelope C7</source> + <translation>Obálka C7</translation> + </message> + <message> + <source>Envelope DL</source> + <translation>Obálka DL</translation> + </message> + <message> + <source>Envelope US 9</source> + <translation>Obálka US 9</translation> + </message> + <message> + <source>Envelope US 10</source> + <translation>Obálka US 10</translation> + </message> + <message> + <source>Envelope US 11</source> + <translation>Obálka US 11</translation> + </message> + <message> + <source>Envelope US 12</source> + <translation>Obálka US 12</translation> + </message> + <message> + <source>Envelope US 14</source> + <translation>Obálka US 14</translation> + </message> + <message> + <source>Envelope Monarch</source> + <translation>Obálka Monarch</translation> + </message> + <message> + <source>Envelope Personal</source> + <translation>Obálka osobní</translation> + </message> + <message> + <source>Envelope Chou 3</source> + <translation>Obálka růžička 3</translation> + </message> + <message> + <source>Envelope Chou 4</source> + <translation>Obálka růžička 4</translation> + </message> + <message> + <source>Envelope Invite</source> + <translation>Obálka pozvánka</translation> + </message> + <message> + <source>Envelope Italian</source> + <translation>Obálka italská</translation> + </message> + <message> + <source>Envelope Kaku 2</source> + <translation>Obálka Kaku 2</translation> + </message> + <message> + <source>Envelope Kaku 3</source> + <translation>Obálka Kaku 3</translation> + </message> + <message> + <source>Envelope PRC 1</source> + <translation>Obálka PRC 1</translation> + </message> + <message> + <source>Envelope PRC 2</source> + <translation>Obálka PRC 2</translation> + </message> + <message> + <source>Envelope PRC 3</source> + <translation>Obálka PRC 3</translation> + </message> + <message> + <source>Envelope PRC 4</source> + <translation>Obálka PRC 4</translation> + </message> + <message> + <source>Envelope PRC 5</source> + <translation>Obálka PRC 5</translation> + </message> + <message> + <source>Envelope PRC 6</source> + <translation>Obálka PRC 6</translation> + </message> + <message> + <source>Envelope PRC 7</source> + <translation>Obálka PRC 7</translation> + </message> + <message> + <source>Envelope PRC 8</source> + <translation>Obálka PRC 8</translation> + </message> + <message> + <source>Envelope PRC 9</source> + <translation>Obálka PRC 9</translation> + </message> + <message> + <source>Envelope PRC 10</source> + <translation>Obálka PRC 10</translation> + </message> + <message> + <source>Envelope You 4</source> + <translation>Obálka ty 4</translation> + </message> +</context> +<context> + <name>QPlatformTheme</name> + <message> + <source>OK</source> + <translation>OK</translation> + </message> + <message> + <source>Save</source> + <translation>Uložit</translation> + </message> + <message> + <source>Save All</source> + <translation>Uložit vše</translation> + </message> + <message> + <source>Open</source> + <translation>Otevřít</translation> + </message> + <message> + <source>&Yes</source> + <translation>&Ano</translation> + </message> + <message> + <source>Yes to &All</source> + <translation>Ano, &vše</translation> + </message> + <message> + <source>&No</source> + <translation>&Ne</translation> + </message> + <message> + <source>N&o to All</source> + <translation>N&e, žádné</translation> + </message> + <message> + <source>Abort</source> + <translation>Zrušit</translation> + </message> + <message> + <source>Retry</source> + <translation>Opakovat</translation> + </message> + <message> + <source>Ignore</source> + <translation>Ignorovat</translation> + </message> + <message> + <source>Close</source> + <translation>Zavřít</translation> + </message> + <message> + <source>Cancel</source> + <translation>Zrušit</translation> + </message> + <message> + <source>Discard</source> + <translation>Zahodit</translation> + </message> + <message> + <source>Help</source> + <translation>Nápověda</translation> + </message> + <message> + <source>Apply</source> + <translation>Použít</translation> + </message> + <message> + <source>Reset</source> + <translation>Vrátit</translation> + </message> + <message> + <source>Restore Defaults</source> + <translation>Obnovit výchozí</translation> + </message> +</context> +<context> <name>QPluginLoader</name> <message> <source>The plugin was not loaded.</source> @@ -2960,6 +3626,10 @@ <source>OK</source> <translation>OK</translation> </message> + <message> + <source>Automatic</source> + <translation>Automaticky</translation> + </message> </context> <context> <name>QPrintPreviewDialog</name> @@ -3037,11 +3707,11 @@ </message> <message> <source>Export to PDF</source> - <translation>Vyvést do PDF</translation> + <translation>Exportovat do PDF</translation> </message> <message> <source>Export to PostScript</source> - <translation>Vyvést do PostScriptu</translation> + <translation>Exportovat do PostScriptu</translation> </message> </context> <context> @@ -3620,7 +4290,7 @@ </message> <message> <source>Unable to rollback transaction</source> - <translation>Transakci se nepodařilo zvrátit</translation> + <translation>Transakci se nepodařilo vrátit</translation> </message> </context> <context> @@ -3654,7 +4324,7 @@ </message> <message> <source>Unable to rollback transaction</source> - <translation>Transakci se nepodařilo zvrátit</translation> + <translation>Transakci se nepodařilo vrátit</translation> </message> </context> <context> @@ -5547,6 +6217,22 @@ <translation>PDF Konec vložení/přepsání směru</translation> </message> <message> + <source>LRI Left-to-right isolate</source> + <translation>LRI zleva doprava oddělit</translation> + </message> + <message> + <source>RLI Right-to-left isolate</source> + <translation>RLI zprava doleva oddělit</translation> + </message> + <message> + <source>FSI First strong isolate</source> + <translation>FSI první silný oddělit</translation> + </message> + <message> + <source>PDI Pop directional isolate</source> + <translation>PDI Pop směrově oddělit</translation> + </message> + <message> <source>Insert Unicode control character</source> <translation>Vložit kontrolní znak Unicode</translation> </message> @@ -5953,7 +6639,7 @@ </message> <message> <source>Ignore</source> - <translation>Přehlížet</translation> + <translation>Ignorovat</translation> </message> <message> <source>Restore Defaults</source> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.1/translations/qtbase_de.ts new/qttranslations-opensource-src-5.3.2/translations/qtbase_de.ts --- old/qttranslations-opensource-src-5.3.1/translations/qtbase_de.ts 2014-06-19 12:08:09.000000000 +0200 +++ new/qttranslations-opensource-src-5.3.2/translations/qtbase_de.ts 2014-08-01 12:13:28.000000000 +0200 @@ -208,6 +208,22 @@ <source>Exit</source> <translation>Verlassen</translation> </message> + <message> + <source>Cut</source> + <translation>Ausschneiden</translation> + </message> + <message> + <source>Copy</source> + <translation>Kopieren</translation> + </message> + <message> + <source>Paste</source> + <translation>Einfügen</translation> + </message> + <message> + <source>Select All</source> + <translation>Alles auswählen</translation> + </message> </context> <context> <name>QCocoaTheme</name> @@ -2059,8 +2075,8 @@ <translation><h3>Über Qt</h3>Dieses Programm verwendet Qt Version %1.</translation> </message> <message> - <source>Qt is a C++ toolkit for cross-platform application development.Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.Qt is available under three different licensing options designed to accommodate the needs of our various users.Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications provided you can comply with the terms and conditions of the GNU LGPL version 2.1.Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.Please see <a href="http://qt.digia.com/Product/Licensing/">qt.digia.com/Pro… for an overview of Qt licensing.Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) and other contributors.Qt and the Qt logo are trademarks of Digia Plc and/or its subsidiary(-ies).Qt is developed as an open source project on <a href="http://qt-project.org/">qt-project.org</a>.</p&… is a Digia product. See <a href="http://qt.digia.com/">qt.digia.com</a> for more information.</source> - <translation>Qt is a C++ toolkit for cross-platform application development.Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.Qt is available under three different licensing options designed to accommodate the needs of our various users.Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications provided you can comply with the terms and conditions of the GNU LGPL version 2.1.Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.Please see <a href="http://qt.digia.com/Product/Licensing/">qt.digia.com/Pro… for an overview of Qt licensing.Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) and other contributors.Qt and the Qt logo are trademarks of Digia Plc and/or its subsidiary(-ies).Qt is developed as an open source project on <a href="http://qt-project.org/">qt-project.org</a>.</p&… is a Digia product. See <a href="http://qt.digia.com/">qt.digia.com</a> for more information.</translation> + <source>Qt is a C++ toolkit for cross-platform application development.Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.Qt is available under three different licensing options designed to accommodate the needs of our various users.Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications provided you can comply with the terms and conditions of the GNU LGPL version 2.1.Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.Please see <a href="http://qt.digia.com/Product/Licensing/">qt.digia.com/Pro… for an overview of Qt licensing.Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies) and other contributors.Qt and the Qt logo are trademarks of Digia Plc and/or its subsidiary(-ies).Qt is developed as an open source project on <a href="http://qt-project.org/">qt-project.org</a>.</p&… is a Digia product. See <a href="http://qt.digia.com/">qt.digia.com</a> for more information.</source> + <translation>Qt is a C++ toolkit for cross-platform application development.Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.Qt is available under three different licensing options designed to accommodate the needs of our various users.Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications provided you can comply with the terms and conditions of the GNU LGPL version 2.1.Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.Please see <a href="http://qt.digia.com/Product/Licensing/">qt.digia.com/Pro… for an overview of Qt licensing.Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies) and other contributors.Qt and the Qt logo are trademarks of Digia Plc and/or its subsidiary(-ies).Qt is developed as an open source project on <a href="http://qt-project.org/">qt-project.org</a>.</p&… is a Digia product. See <a href="http://qt.digia.com/">qt.digia.com</a> for more information.</translation> </message> <message> <source>About Qt</source> @@ -5988,6 +6004,21 @@ </message> </context> <context> + <name>QWindowsDirect2DIntegration</name> + <message> + <source>Qt cannot load the direct2d platform plugin because the Direct2D version on this system is too old. The minimum system requirement for this platform plugin is Windows 7 SP1 with Platform Update. + +The minimum Direct2D version required is %1.%2.%3.%4. The Direct2D version on this system is %5.%6.%7.%8.</source> + <translation>Qt kann das Direct2D-Plattform-Plugin nicht laden, weil die auf dem System installierte Version von Direct2D veraltet ist. Dieses Plattform-Plugin erfordert mindestens Windows 7 SP1 mit Plattform Update. + +Die minimal erforderliche Version von Direct2D ist %1.%2.%3.%4. Die auf diesem System installierte Version von Direct2D ist %5.%6.%7.%8.</translation> + </message> + <message> + <source>Cannot load direct2d platform plugin</source> + <translation>Direct2D-Plattform-Plugin kann nicht geladen werden</translation> + </message> +</context> +<context> <name>QWizard</name> <message> <source>Go Back</source> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.1/translations/qtdeclarative_de.ts new/qttranslations-opensource-src-5.3.2/translations/qtdeclarative_de.ts --- old/qttranslations-opensource-src-5.3.1/translations/qtdeclarative_de.ts 2014-06-19 12:08:09.000000000 +0200 +++ new/qttranslations-opensource-src-5.3.2/translations/qtdeclarative_de.ts 2014-08-01 12:13:28.000000000 +0200 @@ -144,34 +144,6 @@ <source>Expected type name</source> <translation>Es wird ein Typname erwartet</translation> </message> - <message> - <source>Non-existent attached object</source> - <translation>Es existiert kein Bezugselement für die Eigenschaft</translation> - </message> - <message> - <source>Signal uses unnamed parameter followed by named parameter.</source> - <translation>Das Signal verwendet einen namenlosen Parameter gefolgt von einem Parameter mit Namen.</translation> - </message> - <message> - <source>Signal parameter "%1" hides global variable.</source> - <translation>Der Signalparameter "%1" überdeckt eine globale Variable.</translation> - </message> - <message> - <source>Cannot assign a value to a signal (expecting a script to be run)</source> - <translation>Einem Signal können keine Werte zugewiesen werden (es wird ein ausführbares Skript erwartet)</translation> - </message> - <message> - <source>Incorrectly specified signal assignment</source> - <translation>Angegebene Signalzuweisung ist nicht korrekt</translation> - </message> - <message> - <source>"%1.%2" is not available in %3 %4.%5.</source> - <translation>"%1.%2" ist in %3 %4.%5 nicht verfügbar.</translation> - </message> - <message> - <source>"%1.%2" is not available due to component versioning.</source> - <translation>"%1.%2" ist in dieser Version der Komponente nicht verfügbar.</translation> - </message> </context> <context> <name>QQmlComponent</name> @@ -517,14 +489,6 @@ <translation>ListElement: Die spezielle "id"-Eigenschaft kann nicht verwendet werden</translation> </message> <message> - <source>ListElement: improperly specified %1</source> - <translation>ListElement: Ungültige Angabe %1</translation> - </message> - <message> - <source>ListElement: improperly specified QT_TRANSLATE_NOOP</source> - <translation>ListElement: Ungültige Angabe von QT_TRANSLATE_NOOP</translation> - </message> - <message> <source>ListElement: cannot use script for property value</source> <translation>ListElement: Es kann kein Skript für den Wert der Eigenschaft verwendet werden</translation> </message> @@ -1374,6 +1338,37 @@ </message> </context> <context> + <name>SignalHandlerConverter</name> + <message> + <source>Non-existent attached object</source> + <translation>Das als "attached" angegebene Objekt existiert nicht</translation> + </message> + <message> + <source>Signal uses unnamed parameter followed by named parameter.</source> + <translation>Das Signal verwendet einen unbenannten Parameter, auf den ein benannter Parameter folgt.</translation> + </message> + <message> + <source>Signal parameter "%1" hides global variable.</source> + <translation>Der Signalparameter "%1" überdeckt eine globale Variable.</translation> + </message> + <message> + <source>"%1.%2" is not available in %3 %4.%5.</source> + <translation>"%1.%2" ist in %3 %4.%5 nicht verfügbar.</translation> + </message> + <message> + <source>"%1.%2" is not available due to component versioning.</source> + <translation>"%1.%2" ist wegen der Versionierung der Komponente nicht verfügbar.</translation> + </message> + <message> + <source>Cannot assign a value to a signal (expecting a script to be run)</source> + <translation>Einem Signal können keine Werte zugewiesen werden (es wird ein ausführbares Skript erwartet)</translation> + </message> + <message> + <source>Incorrectly specified signal assignment</source> + <translation>Angegebene Signalzuweisung ist nicht korrekt</translation> + </message> +</context> +<context> <name>qmlRegisterType</name> <message> <source>Invalid QML %1 name "%2"</source> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.1/translations/qtmultimedia_cs.ts new/qttranslations-opensource-src-5.3.2/translations/qtmultimedia_cs.ts --- old/qttranslations-opensource-src-5.3.1/translations/qtmultimedia_cs.ts 2014-06-19 12:08:09.000000000 +0200 +++ new/qttranslations-opensource-src-5.3.2/translations/qtmultimedia_cs.ts 2014-08-01 12:13:28.000000000 +0200 @@ -174,6 +174,10 @@ <source>Service has not been started</source> <translation>Služba nebyla spuštěna</translation> </message> + <message> + <source>Recording permissions are not available</source> + <translation>Oprávnění pro nahrávání nejsou dostupná</translation> + </message> </context> <context> <name>CameraBinSession</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.1/translations/qtmultimedia_de.ts new/qttranslations-opensource-src-5.3.2/translations/qtmultimedia_de.ts --- old/qttranslations-opensource-src-5.3.1/translations/qtmultimedia_de.ts 2014-06-19 12:08:10.000000000 +0200 +++ new/qttranslations-opensource-src-5.3.2/translations/qtmultimedia_de.ts 2014-08-01 12:13:28.000000000 +0200 @@ -276,18 +276,6 @@ <source>Error parsing playlist at line[%1]:%2</source> <translation>Fehler beim Auswerten der Abspielliste bei Zeile [%1]:%2</translation> </message> - <message> - <source>File%1</source> - <translation>Datei%1</translation> - </message> - <message> - <source>Title%1</source> - <translation>Titel%1</translation> - </message> - <message> - <source>Length%1</source> - <translation>Länge%1</translation> - </message> </context> <context> <name>QAndroidAudioEncoderSettingsControl</name> @@ -307,6 +295,10 @@ <context> <name>QAndroidCameraSession</name> <message> + <source>Camera cannot be started without a viewfinder.</source> + <translation>Die Kamera kann nicht ohne Sucher gestartet werden.</translation> + </message> + <message> <source>Camera not ready</source> <translation>Kamera nicht bereit</translation> </message> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.1/translations/qtxmlpatterns_cs.ts new/qttranslations-opensource-src-5.3.2/translations/qtxmlpatterns_cs.ts --- old/qttranslations-opensource-src-5.3.1/translations/qtxmlpatterns_cs.ts 2014-06-19 12:08:09.000000000 +0200 +++ new/qttranslations-opensource-src-5.3.2/translations/qtxmlpatterns_cs.ts 2014-08-01 12:13:28.000000000 +0200 @@ -184,7 +184,7 @@ </message> <message> <source>In a namespace constructor, the value for a namespace cannot be an empty string.</source> - <translation>Ve staviteli jmenného prostoru nesmí mýt hodnota jmenného prostoru prázdným řetězcem.</translation> + <translation>V konstruktoru jmenného prostoru nesmí mýt hodnota jmenného prostoru prázdným řetězcem.</translation> </message> <message> <source>The prefix must be a valid %1, which %2 is not.</source> @@ -340,15 +340,15 @@ </message> <message> <source>It will not be possible to retrieve %1.</source> - <translation>%1 nelze určit.</translation> + <translation>Nebude možné získat %1.</translation> </message> <message> <source>The default collection is undefined</source> - <translation>Pro sbírku není stanovena žádná předloha</translation> + <translation>Výchozí sbírka XSLT není definována</translation> </message> <message> <source>%1 cannot be retrieved</source> - <translation>%1 nelze určit</translation> + <translation>%1 nelze získat</translation> </message> <message> <source>The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization).</source> @@ -364,7 +364,7 @@ </message> <message> <source>The URI cannot have a fragment</source> - <translation>URI nesmí obsahovat kousek</translation> + <translation>URI nesmí obsahovat fragment</translation> </message> <message> <source>Required cardinality is %1; got cardinality %2.</source> @@ -452,6 +452,10 @@ </message> <message> <source>The prefix %1 cannot be bound. By default, it is already bound to the namespace %2.</source> + <translation>Předpona %1 nemůže být přiřazena. Ve výchozím nastavení je již spojena se jmenným prostorem %2.</translation> + </message> + <message> + <source>The prefix %1 can not be bound. By default, it is already bound to the namespace %2.</source> <translation>Předpona %1 nemůže být spojena. Ve výchozím nastavení je již spojena se jmenným prostorem %2.</translation> </message> <message> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-creator for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package libqt5-creator for openSUSE:Factory checked in at 2014-09-08 21:28:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-creator (Old) and /work/SRC/openSUSE:Factory/.libqt5-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-creator" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-creator/libqt5-creator.changes 2014-06-30 21:50:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-creator.new/libqt5-creator.changes 2014-09-08 21:29:06.000000000 +0200 @@ -1,0 +2,19 @@ +Tue Aug 19 14:21:20 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 3.2.0 + * Block selections in text editors now allow you to do “column + editing”, meaning that all selected lines are edited + simultaneously (Qt Creator Manual) + * Context help can now be configured to open in an external + window (without disabling Help mode) + * Support for C99 designated initializers and concatenated strings + was added to the C++ code model, as well as improvements to + encoding handling and lambda support and many other things + * More panes are now searchable with Ctrl+F, for example the + project tree + * The QML profiler received many performance and stability + improvements again + * For more details please see: + http://blog.qt.digia.com/blog/2014/08/19/qt-creator-3-2-0-released/ + +------------------------------------------------------------------- Old: ---- qt-creator-opensource-src-3.1.2.tar.gz New: ---- qt-creator-opensource-src-3.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-creator.spec ++++++ --- /var/tmp/diff_new_pack.EfzIa3/_old 2014-09-08 21:29:08.000000000 +0200 +++ /var/tmp/diff_new_pack.EfzIa3/_new 2014-09-08 21:29:08.000000000 +0200 @@ -17,16 +17,16 @@ Name: libqt5-creator -Version: 3.1.2 +Version: 3.2.0 Release: 0 Summary: Lightweight IDE License: SUSE-LGPL-2.1-with-digia-exception-1.1 Group: Development/Tools/IDE Url: http://qt.digia.com/Product/Developer-Tools/ -%define rversion 3.1.2 +%define rversion 3.2.0 %define rname qt-creator -%define qt5_version 5.3.1 -Source: http://download.qt-project.org/official_releases/qtcreator/3.1/%{rversion}/… +%define qt5_version 5.3.2~git20140904 +Source: https://download.qt-project.org/official_releases/qtcreator/3.2/%{rversion}… Source1: %{name}-rpmlintrc Source2: qtcreator.desktop # PATCH-FIX-UPSTREAM qbs-path.diff -- install qbs plugin to sane location ++++++ qt-creator-opensource-src-3.1.2.tar.gz -> qt-creator-opensource-src-3.2.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/libqt5-creator/qt-creator-opensource-src-3.1.2.tar.gz /work/SRC/openSUSE:Factory/.libqt5-creator.new/qt-creator-opensource-src-3.2.0.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kate for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package kate for openSUSE:Factory checked in at 2014-09-08 21:28:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate (Old) and /work/SRC/openSUSE:Factory/.kate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kate" Changes: -------- --- /work/SRC/openSUSE:Factory/kate/kate.changes 2014-08-25 11:03:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2014-09-08 21:29:04.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 5 19:37:25 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Use suplements: packageand(IPython:kate), instead of recommending + IPython as that deliver an installation of 4 digit number of packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate.spec ++++++ --- /var/tmp/diff_new_pack.abNQfS/_old 2014-09-08 21:29:05.000000000 +0200 +++ /var/tmp/diff_new_pack.abNQfS/_new 2014-09-08 21:29:05.000000000 +0200 @@ -101,7 +101,7 @@ %package python-plugins Summary: Additional python plugins for %{name} Group: Productivity/Editors/Other -Recommends: IPython +Supplements: packageand(IPython:kate) Recommends: python-jedi Recommends: python-Jinja2 Recommends: python-ply -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2014-09-08 21:28:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2014-08-30 18:55:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2014-09-08 21:29:03.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Sep 3 17:29:35 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Create new addons subpackage: split out systemsettings and addons + for co-instability with Plasma5 and to maintain the ability to + maintain settings for kdelibs4 based applications +- Move all oxygen components in liboxygenstyle subpackage +- Add libs subpackage to baselibs (needed for liboxygenstyle) +- Harden interdependancies of some packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.27M2SM/_old 2014-09-08 21:29:04.000000000 +0200 +++ /var/tmp/diff_new_pack.27M2SM/_new 2014-09-08 21:29:04.000000000 +0200 @@ -160,6 +160,7 @@ Requires: xmessage Requires: xprop # The openSUSE-release package should always be installed, but just to make sure as that kinfocenter needs it +Requires: %{name}-addons = %{version} Requires: %{name}-libs = %{version} Requires: distribution-release Requires: socat @@ -238,6 +239,7 @@ Provides: windowmanager %kde4_runtime_requires Requires: %{name}-branding = %{_kde_branding_version} +Requires: %{name}-liboxygenstyle >= %{version} Provides: kdebase3:/opt/kde3/bin/kwin %description -n kwin @@ -253,6 +255,17 @@ This package contains the Greeter Plugins that are needed by KDM and Screensaver unlocking +%package addons +Summary: The KDE Workspace addons +Group: System/GUI/KDE +Requires: %{name}-libs = %{version} +%kde4_runtime_requires + +%description addons +This package contains the files required to run the KDE4 systemsettings, and aditional +addons useful outside 4.x Plasma. They were split out for co-instability with Plasma5 +and to maintain the ability to maintain settings for kdelibs4 based applications. + %package devel Summary: The KDE Workspace Components Group: Development/Libraries/KDE @@ -287,6 +300,7 @@ %package liboxygenstyle Summary: The Libraries of the oxygen-style Group: System/GUI/KDE +Requires: %{name}-libs = %{version} %kde4_runtime_requires %description liboxygenstyle @@ -398,6 +412,7 @@ %create_subdir_filelist -d kdm -v devel %create_subdir_filelist -d kwin -v devel %create_subdir_filelist -d ksysguard -v devel + %create_subdir_filelist -d systemsettings -v devel cd .. sed -ri "s,.*%{_kde4_configdir}/kdm/backgroundrc,," filelists/kdm sed -ri "s,.*%{_kde4_configdir}/kdm/README,," filelists/kdm @@ -411,7 +426,7 @@ mkdir -p %{buildroot}/etc rm -rf %{buildroot}%{_kde4_htmldir}/en/kicker pushd $RPM_BUILD_DIR/%buildsubdir/ - cat filelists/devel filelists/kdm filelists/kwin | while read line; do echo "%exclude $line";done >filelists/exclude + cat filelists/devel filelists/systemsettings filelists/kdm filelists/kwin | while read line; do echo "%exclude $line";done >filelists/exclude popd %suse_update_desktop_file systemsettings X-SuSE-core %suse_update_desktop_file ksysguard System Monitor @@ -556,6 +571,13 @@ %exclude %{_kde4_appsdir}/kwin/cubecap.png %exclude %{_kde4_appsdir}/kwin/titlebar_decor.png %exclude %{_kde4_datadir}/dbus-1/interfaces/org.kde.KWin.xml +%exclude %{_kde4_libdir}/libkdecorations.so* +%exclude %{_kde4_bindir}/oxygen-shadow-demo +%exclude %{_kde4_modulesdir}/kwin3_oxygen.so +%exclude %{_kde4_modulesdir}/kwin_oxygen_config.so +%exclude %{_kde4_appsdir}/kconf_update/oxygen.upd +%exclude %{_kde4_appsdir}/kconf_update/update_oxygen.pl +%exclude %{_kde4_appsdir}/kwin/oxygenclient.desktop %{_kde4_appsdir}/kwin/default_rules/plasma_desktop_containment.kwinrules %files liboxygenstyle @@ -564,10 +586,21 @@ %dir %{_kde4_modulesdir}/plugins/styles %{_kde4_bindir}/oxygen-demo %{_kde4_bindir}/oxygen-settings +%{_kde4_bindir}/oxygen-shadow-demo %{_kde4_libdir}/liboxygenstyle.so.* %{_kde4_libdir}/liboxygenstyleconfig.so.* %{_kde4_modulesdir}/kstyle_oxygen_config.so %{_kde4_modulesdir}/plugins/styles/oxygen.so +%{_kde4_modulesdir}/kwin3_oxygen.so +%{_kde4_modulesdir}/kwin_oxygen_config.so +%dir %{_kde4_appsdir}/kstyle +%dir %{_kde4_appsdir}/kstyle/themes +%{_kde4_appsdir}/kstyle/themes/oxygen.themerc +%dir %{_kde4_appsdir}/kconf_update +%{_kde4_appsdir}/kconf_update/oxygen.upd +%{_kde4_appsdir}/kconf_update/update_oxygen.pl +%dir %{_kde4_appsdir}/kwin +%{_kde4_appsdir}/kwin/oxygenclient.desktop %files plasma-calendar %defattr(-,root,root) @@ -583,6 +616,7 @@ %{_kde4_datadir}/dbus-1/interfaces/ %{_kde4_includedir}/* %{_kde4_libdir}/cmake/KDE4Workspace/ +%{_kde4_libdir}/libkdecorations.so %{_kde4_libdir}/libkephal.so %{_kde4_libdir}/libkfontinst.so %{_kde4_libdir}/libkfontinstui.so @@ -607,6 +641,104 @@ %{_kde4_libdir}/libweather_ion.so %{_kde4_modulesdir}/plugins/designer/ksysguardlsofwidgets.so +%files addons -f filelists/systemsettings +%defattr(-,root,root) +%doc COPYING README +%{_kde4_modulesdir}/kcm*.so +%{_kde4_modulesdir}/kded_appmenu.so +%{_kde4_modulesdir}/kded_freespacenotifier.so +%{_kde4_modulesdir}/kded_keyboard.so +%{_kde4_modulesdir}/kded_khotkeys.so +%{_kde4_modulesdir}/kded_ktouchpadenabler.so +%{_kde4_modulesdir}/kded_kwrited.so +%{_kde4_modulesdir}/kded_statusnotifierwatcher.so +%{_kde4_modulesdir}/kstyle*.so +%{_kde4_modulesdir}/plugins/styles/ +%{_kde4_servicesdir}/style.desktop +%{_kde4_servicesdir}/screensaver.desktop +%{_kde4_servicesdir}/kcm_infosummary.desktop +%{_kde4_servicesdir}/dma.desktop +%{_kde4_servicesdir}/mouse.desktop +%{_kde4_servicesdir}/interrupts.desktop +%{_kde4_servicesdir}/ksplashthememgr.desktop +%{_kde4_servicesdir}/kcm_pci.desktop +%{_kde4_servicesdir}/kcm_keyboard.desktop +%{_kde4_servicesdir}/opengl.desktop +%{_kde4_servicesdir}/autostart.desktop +%{_kde4_servicesdir}/fontinst.desktop +%{_kde4_servicesdir}/ioports.desktop +%{_kde4_servicesdir}/kcmsmserver.desktop +%{_kde4_servicesdir}/nic.desktop +%{_kde4_servicesdir}/joystick.desktop +%{_kde4_servicesdir}/solid-actions.desktop +%{_kde4_servicesdir}/keys.desktop +%{_kde4_servicesdir}/devinfo.desktop +%{_kde4_servicesdir}/workspaceoptions.desktop +%{_kde4_servicesdir}/cursortheme.desktop +%{_kde4_servicesdir}/display.desktop +%{_kde4_servicesdir}/standard_actions.desktop +%{_kde4_servicesdir}/clock.desktop +%{_kde4_servicesdir}/kcmlaunch.desktop +%{_kde4_servicesdir}/scsi.desktop +%{_kde4_servicesdir}/desktoppath.desktop +%{_kde4_servicesdir}/fonts.desktop +%{_kde4_servicesdir}/desktoptheme.desktop +%{_kde4_servicesdir}/xserver.desktop +%{_kde4_servicesdir}/khotkeys.desktop +%{_kde4_servicesdir}/bell.desktop +%{_kde4_servicesdir}/colors.desktop +%{_kde4_servicesdir}/kcmaccess.desktop +%{_kde4_servicesdir}/kcm_memory.desktop +%{_kde4_servicesdir}/kcmview1394.desktop +%{_kde4_servicesdir}/smbstatus.desktop +%dir %{_kde4_servicesdir}/kded +%{_kde4_servicesdir}/kded/appmenu.desktop +%{_kde4_servicesdir}/kded/khotkeys.desktop +%{_kde4_servicesdir}/kded/kwrited.desktop +%{_kde4_servicesdir}/kded/statusnotifierwatcher.desktop +%{_kde4_servicesdir}/kded/freespacenotifier.desktop +%{_kde4_servicesdir}/kded/keyboard.desktop +%{_kde4_servicesdir}/kded/ktouchpadenabler.desktop +%{_kde4_appsdir}/kstyle/ +%{_kde4_appsdir}/kcmstyle/ +%{_kde4_appsdir}/color-schemes/ +%{_kde4_appsdir}/kaccess/ +%{_kde4_appsdir}/kcmkeyboard/ +%{_kde4_appsdir}/kcmusb/ +%{_kde4_appsdir}/kfontview/ +%{_kde4_appsdir}/ksplash/ +%{_kde4_appsdir}/desktoptheme/ +%{_kde4_appsdir}/kcmkeys/ +%{_kde4_appsdir}/kcmview1394/ +%{_kde4_appsdir}/kdisplay/ +%{_kde4_appsdir}/khotkeys/ +%{_kde4_appsdir}/konqsidebartng/ +%{_kde4_appsdir}/kthememanager/ +%{_kde4_appsdir}/freespacenotifier/ +%{_kde4_appsdir}/kcminput/ +%{_kde4_appsdir}/kcmsolidactions/ +%{_kde4_appsdir}/ksmserver/ +%{_kde4_appsdir}/kwrited/ +%{_kde4_appsdir}/solid/ +%dir %{_kde4_configkcfgdir} +%{_kde4_configkcfgdir}/klaunch.kcfg +%{_kde4_configkcfgdir}/freespacenotifier.kcfg +%dir %{_kde4_configdir} +%config %{_kde4_configdir}/activities.knsrc +%config %{_kde4_configdir}/colorschemes.knsrc +%config %{_kde4_configdir}/kfontinst.knsrc +%config %{_kde4_configdir}/ksplash.knsrc +%config %{_kde4_configdir}/plasma-themes.knsrc +%config %{_kde4_configdir}/wallpaper.knsrc +%config %{_kde4_configdir}/xcursor.knsrc +%exclude %{_kde4_libdir}/libsystemsettingsview.so.* +%exclude %{_kde4_modulesdir}/kcm_kwin*.so +%exclude %{_kde4_modulesdir}/kcm_kdm.so +%exclude %{_kde4_modulesdir}/kcm_randr.so +%exclude %{_kde4_modulesdir}/plugins/styles/oxygen.so +%exclude %{_kde4_modulesdir}/kstyle_oxygen_config.so +%exclude %{_kde4_appsdir}/kstyle/themes/oxygen.themerc + %files -n python-kdebase4 %defattr(-,root,root) %doc COPYING README @@ -639,7 +771,8 @@ %{_kde4_appsdir}/ %{_kde4_bindir}/* %{_kde4_configdir}/ -%{_kde4_configkcfgdir}/ +%dir %{_kde4_configkcfgdir} +%{_kde4_configkcfgdir}/plasma-shell-desktop.kcfg %{_kde4_datadir}/autostart/ %{_kde4_datadir}/dbus-1/services/ %{_kde4_datadir}/dbus-1/system-services/ @@ -659,6 +792,8 @@ %exclude %{_kde4_appsdir}/cmake %exclude %{_kde4_appsdir}/doc %exclude %{_kde4_appsdir}/doc/kdm +%exclude %{_kde4_appsdir}/kstyle +%exclude %{_kde4_appsdir}/kcmstyle %exclude %{_kde4_appsdir}/kdm %exclude %{_kde4_appsdir}/ksysguard %exclude %{_kde4_appsdir}/kwin/cubecap.png @@ -668,6 +803,25 @@ %exclude %{_kde4_appsdir}/plasma-netbook/init %exclude %{_kde4_appsdir}/plasma/layout-templates %exclude %{_kde4_appsdir}/plasma_scriptengine_python +%exclude %{_kde4_appsdir}/color-schemes/ +%exclude %{_kde4_appsdir}/kaccess/ +%exclude %{_kde4_appsdir}/kcmkeyboard/ +%exclude %{_kde4_appsdir}/kcmusb/ +%exclude %{_kde4_appsdir}/kfontview/ +%exclude %{_kde4_appsdir}/ksplash/ +%exclude %{_kde4_appsdir}/desktoptheme/ +%exclude %{_kde4_appsdir}/kcmkeys/ +%exclude %{_kde4_appsdir}/kcmview1394/ +%exclude %{_kde4_appsdir}/kdisplay/ +%exclude %{_kde4_appsdir}/khotkeys/ +%exclude %{_kde4_appsdir}/konqsidebartng/ +%exclude %{_kde4_appsdir}/kthememanager/ +%exclude %{_kde4_appsdir}/freespacenotifier/ +%exclude %{_kde4_appsdir}/kcminput/ +%exclude %{_kde4_appsdir}/kcmsolidactions/ +%exclude %{_kde4_appsdir}/ksmserver/ +%exclude %{_kde4_appsdir}/kwrited/ +%exclude %{_kde4_appsdir}/solid/ %exclude %{_kde4_bindir}/krandrstartup %exclude %{_kde4_bindir}/krandrtray %exclude %{_kde4_bindir}/ksysguard @@ -677,6 +831,13 @@ %exclude %{_kde4_configdir}/kdm %exclude %{_kde4_configdir}/kdm/backgroundrc %exclude %{_kde4_configdir}/ksysguard.knsrc +%exclude %{_kde4_configdir}/activities.knsrc +%exclude %{_kde4_configdir}/colorschemes.knsrc +%exclude %{_kde4_configdir}/kfontinst.knsrc +%exclude %{_kde4_configdir}/ksplash.knsrc +%exclude %{_kde4_configdir}/plasma-themes.knsrc +%exclude %{_kde4_configdir}/wallpaper.knsrc +%exclude %{_kde4_configdir}/xcursor.knsrc %exclude %{_kde4_htmldir}/en/kdm %exclude %{_kde4_htmldir}/en/ksysguard %exclude %{_kde4_iconsdir}/oxygen/16x16/apps/computer.png @@ -732,8 +893,18 @@ %exclude %{_kde4_libdir}/libtaskmanager.so.* %exclude %{_kde4_libdir}/libweather_ion.so %exclude %{_kde4_libdir}/libweather_ion.so.* +%exclude %{_kde4_libdir}/libkhotkeysprivate.so.* %exclude %{_kde4_modulesdir}/kcm_kdm.so %exclude %{_kde4_modulesdir}/kcm_randr.so +%exclude %{_kde4_modulesdir}/kcm*.so +%exclude %{_kde4_modulesdir}/kded_appmenu.so +%exclude %{_kde4_modulesdir}/kded_freespacenotifier.so +%exclude %{_kde4_modulesdir}/kded_keyboard.so +%exclude %{_kde4_modulesdir}/kded_khotkeys.so +%exclude %{_kde4_modulesdir}/kded_ktouchpadenabler.so +%exclude %{_kde4_modulesdir}/kded_kwrited.so +%exclude %{_kde4_modulesdir}/kded_statusnotifierwatcher.so +%exclude %{_kde4_modulesdir}/kstyle*.so %exclude %{_kde4_modulesdir}/kded_randrmonitor.so %exclude %{_kde4_modulesdir}/kgreet_*.so %exclude %{_kde4_modulesdir}/kstyle_oxygen_config.so @@ -753,6 +924,50 @@ %exclude %{_kde4_servicesdir}/plasma-scriptengine-runner-python.desktop %exclude %{_kde4_servicesdir}/plasma-scriptengine-wallpaper-python.desktop %exclude %{_kde4_servicesdir}/randr.desktop +%exclude %{_kde4_servicesdir}/style.desktop +%exclude %{_kde4_servicesdir}/screensaver.desktop +%exclude %{_kde4_servicesdir}/kcm_infosummary.desktop +%exclude %{_kde4_servicesdir}/dma.desktop +%exclude %{_kde4_servicesdir}/mouse.desktop +%exclude %{_kde4_servicesdir}/interrupts.desktop +%exclude %{_kde4_servicesdir}/ksplashthememgr.desktop +%exclude %{_kde4_servicesdir}/kcm_pci.desktop +%exclude %{_kde4_servicesdir}/kcm_keyboard.desktop +%exclude %{_kde4_servicesdir}/opengl.desktop +%exclude %{_kde4_servicesdir}/autostart.desktop +%exclude %{_kde4_servicesdir}/fontinst.desktop +%exclude %{_kde4_servicesdir}/ioports.desktop +%exclude %{_kde4_servicesdir}/kcmsmserver.desktop +%exclude %{_kde4_servicesdir}/nic.desktop +%exclude %{_kde4_servicesdir}/joystick.desktop +%exclude %{_kde4_servicesdir}/solid-actions.desktop +%exclude %{_kde4_servicesdir}/keys.desktop +%exclude %{_kde4_servicesdir}/devinfo.desktop +%exclude %{_kde4_servicesdir}/workspaceoptions.desktop +%exclude %{_kde4_servicesdir}/cursortheme.desktop +%exclude %{_kde4_servicesdir}/display.desktop +%exclude %{_kde4_servicesdir}/standard_actions.desktop +%exclude %{_kde4_servicesdir}/clock.desktop +%exclude %{_kde4_servicesdir}/kcmlaunch.desktop +%exclude %{_kde4_servicesdir}/scsi.desktop +%exclude %{_kde4_servicesdir}/desktoppath.desktop +%exclude %{_kde4_servicesdir}/fonts.desktop +%exclude %{_kde4_servicesdir}/desktoptheme.desktop +%exclude %{_kde4_servicesdir}/xserver.desktop +%exclude %{_kde4_servicesdir}/khotkeys.desktop +%exclude %{_kde4_servicesdir}/bell.desktop +%exclude %{_kde4_servicesdir}/colors.desktop +%exclude %{_kde4_servicesdir}/kcmaccess.desktop +%exclude %{_kde4_servicesdir}/kcm_memory.desktop +%exclude %{_kde4_servicesdir}/kcmview1394.desktop +%exclude %{_kde4_servicesdir}/smbstatus.desktop +%exclude %{_kde4_servicesdir}/kded/appmenu.desktop +%exclude %{_kde4_servicesdir}/kded/khotkeys.desktop +%exclude %{_kde4_servicesdir}/kded/kwrited.desktop +%exclude %{_kde4_servicesdir}/kded/statusnotifierwatcher.desktop +%exclude %{_kde4_servicesdir}/kded/freespacenotifier.desktop +%exclude %{_kde4_servicesdir}/kded/keyboard.desktop +%exclude %{_kde4_servicesdir}/kded/ktouchpadenabler.desktop %exclude %{_kde4_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf %exclude %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager-kdm @@ -765,6 +980,7 @@ %files libs %defattr(-,root,root) %doc COPYING README +%{_kde4_libdir}/libkdecorations.so.* %{_kde4_libdir}/libkephal.so.* %{_kde4_libdir}/libkfontinst.so.* %{_kde4_libdir}/libkfontinstui.so.* @@ -785,6 +1001,7 @@ %{_kde4_libdir}/libsystemsettingsview.so.* %{_kde4_libdir}/libtaskmanager.so.* %{_kde4_libdir}/libweather_ion.so.* +%{_kde4_libdir}/libkhotkeysprivate.so.* %{_kde4_modulesdir}/plugins/gui_platform/ %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.27M2SM/_old 2014-09-08 21:29:04.000000000 +0200 +++ /var/tmp/diff_new_pack.27M2SM/_new 2014-09-08 21:29:04.000000000 +0200 @@ -1 +1,2 @@ kdebase4-workspace-liboxygenstyle +kdebase4-workspace-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 libqt5-qtwebkit for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory checked in at 2014-09-08 21:28:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtwebkit" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes 2014-08-20 17:53:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/libqt5-qtwebkit.changes 2014-09-08 21:28:59.000000000 +0200 @@ -1,0 +2,48 @@ +Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 5.3.2~git20140904 (rd8bc98b): + * Tip of the bugfix 5.3.2 branch: + * Fix key identifier for comma key ("Separator") + * Fix fallback conversion of recognized objects + * Fix regression in QQuickWebView's transparent backgound + * Fix crash in DeviceOrientationController when + !HAVE(QTSENSORS) + * Fix case in documentation of qobjectbridge bindings + * Do not add QStyle padding on top of default padding + * [WK2] Update text upon item selection for menu lists + * Do not use title as the primary text of dragged or + copied links + * Show placeholder text when focused + * Do not override padding in textfields + * Avoid crash when hidePopup is called multiple times + * Added support for appending an escaped SegmentedString to + another. + * QWebPage crashes on drag without QWidget view + * Crash during exception unwinding + * Bad cast from CSSInitialValue to CSSValueList + * use after free in WebCore::DocumentOrderedMap::remove / + WebCore::TreeScope::removeElementById + * define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS on HPPA + * Actually load icc.prf for the Intel compiler + * Prevent interpreting URL parameter for Qt plugins + as content URLs. + * Fix android build error about already defined struct. + * Fix SpeculateCellOperand ASSERT failure in DFG for + 32-bit builds. + * QtWebKitWidgets should not depend directly on QtQuick + * QWebHitTestResult::element() should return + the inner element + * Specify location of CMake tests + * Fix WebView crash when using gcc 4.9. + * Fix debug builds of qtwebkit on linux-icc + * Qt5WebKitWidgets should keep private dependencies private + * Prevent crashes when the QWebView gets reparented. + * Fix build with gcc 4.4 + * Add qtxmlpatters to sync.profile + * GraphicsContext for Qt: add + popTransparencyLayerInternal method. + * Bump version +- Reduce general constraints to 4GB, and leave 7GB only for s390x +- Enable qtlocation integration + +------------------------------------------------------------------- Old: ---- qtwebkit-opensource-src-5.3.1.tar.xz New: ---- qtwebkit-opensource-src-5.3.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebkit.spec ++++++ --- /var/tmp/diff_new_pack.2XJb8G/_old 2014-09-08 21:29:02.000000000 +0200 +++ /var/tmp/diff_new_pack.2XJb8G/_new 2014-09-08 21:29:02.000000000 +0200 @@ -16,21 +16,17 @@ # -%define qt5_snapshot 0 +%define qt5_snapshot 1 %define libname libQt5WebKitWidgets5 Name: libqt5-qtwebkit -Version: 5.3.1 +Version: 5.3.2~git20140904 Release: 0 %define base_name libqt5 -%define real_version 5.3.1 -%define so_version 5.3.1 -%if %qt5_snapshot -%define tar_version qtwebkit-%{real_version} -%else +%define real_version 5.3.2 +%define so_version 5.3.2 %define tar_version qtwebkit-opensource-src-%{real_version} -%endif # Workaround ppc64le build failures due to OOM issue, bnc#863533 %ifarch ppc64le %define make_jobs /usr/bin/make -j4 VERBOSE=1 @@ -49,20 +45,20 @@ Patch5: ppc64le-support.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch130: no-Werror-rpath.diff +BuildRequires: libQt5Core-private-headers-devel >= %{version} +BuildRequires: libQt5Gui-private-headers-devel >= %{version} +BuildRequires: libQt5Widgets-private-headers-devel >= %{version} +BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} +BuildRequires: libqt5-qtlocation-private-headers-devel >= %{version} BuildRequires: pkgconfig(Qt5Core) >= %{version} BuildRequires: pkgconfig(Qt5Network) >= %{version} BuildRequires: pkgconfig(Qt5OpenGL) >= %{version} BuildRequires: pkgconfig(Qt5PrintSupport) >= %{version} BuildRequires: pkgconfig(Qt5Quick) >= %{version} +BuildRequires: pkgconfig(Qt5Sensors) >= %{version} BuildRequires: pkgconfig(Qt5Sql) >= %{version} BuildRequires: pkgconfig(Qt5Test) >= %{version} BuildRequires: pkgconfig(Qt5Widgets) >= %{version} -#BuildRequires: pkgconfig(positioning) -BuildRequires: libQt5Core-private-headers-devel >= %{version} -BuildRequires: libQt5Gui-private-headers-devel >= %{version} -BuildRequires: libQt5Widgets-private-headers-devel >= %{version} -BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} -BuildRequires: pkgconfig(Qt5Sensors) >= %{version} %if 0%{?suse_version} < 1315 BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-app-0.10) @@ -115,11 +111,7 @@ handling. %prep -%if %qt5_snapshot -%setup -q -n qtwebkit-%{real_version} -%else %setup -q -n qtwebkit-opensource-src-%{real_version} -%endif %patch1 -p1 %patch2 -p1 %patch3 -p1 ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.2XJb8G/_old 2014-09-08 21:29:02.000000000 +0200 +++ /var/tmp/diff_new_pack.2XJb8G/_new 2014-09-08 21:29:02.000000000 +0200 @@ -1,8 +1,18 @@ <constraints> <hardware> <memory> - <size unit="G">7</size> + <size unit="G">4</size> </memory> <processors>4</processors> </hardware> + <overwrite> + <conditions> + <arch>s390x</arch> + </conditions> + <hardware> + <memory> + <size unit="G">7</size> + </memory> + </hardware> + </overwrite> </constraints> ++++++ qtwebkit-opensource-src-5.3.1.tar.xz -> qtwebkit-opensource-src-5.3.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtwebkit/qtwebkit-opensource-src-5.3.1.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/qtwebkit-opensource-src-5.3.2.tar.xz differ: char 17, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qtxmlpatterns for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package libqt5-qtxmlpatterns for openSUSE:Factory checked in at 2014-09-08 21:28:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtxmlpatterns (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtxmlpatterns.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtxmlpatterns" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtxmlpatterns/libqt5-qtxmlpatterns.changes 2014-06-30 21:50:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtxmlpatterns.new/libqt5-qtxmlpatterns.changes 2014-09-08 21:28:57.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 5.3.2~git20140904 (rd8bc98b): + * Tip of the bugfix 5.3.2 branch: + * Add missing private headers warning + +------------------------------------------------------------------- Old: ---- qtxmlpatterns-opensource-src-5.3.1.tar.xz New: ---- qtxmlpatterns-opensource-src-5.3.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtxmlpatterns.spec ++++++ --- /var/tmp/diff_new_pack.3BJnsC/_old 2014-09-08 21:28:58.000000000 +0200 +++ /var/tmp/diff_new_pack.3BJnsC/_new 2014-09-08 21:28:58.000000000 +0200 @@ -16,25 +16,21 @@ # -%define qt5_snapshot 0 +%define qt5_snapshot 1 %define libname libQt5XmlPatterns5 Name: libqt5-qtxmlpatterns -Version: 5.3.1 +Version: 5.3.2~git20140904 Release: 0 Summary: Qt 5 XmlPatterns Library License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: System/Libraries Url: http://qt.digia.com %define base_name libqt5 -%define real_version 5.3.1 -%define so_version 5.3.1 -%if %qt5_snapshot -%define tar_version qtxmlpatterns-%{real_version} -%else +%define real_version 5.3.2 +%define so_version 5.3.2 %define tar_version qtxmlpatterns-opensource-src-%{real_version} -%endif Source: %{tar_version}.tar.xz Source1: baselibs.conf BuildRequires: libQt5Core-private-headers-devel >= %{version} @@ -54,11 +50,7 @@ handling. %prep -%if %qt5_snapshot -%setup -q -n qtxmlpatterns-%{real_version} -%else %setup -q -n qtxmlpatterns-opensource-src-%{real_version} -%endif %package -n %{libname} Summary: Qt 5 XmlPatterns Library ++++++ qtxmlpatterns-opensource-src-5.3.1.tar.xz -> qtxmlpatterns-opensource-src-5.3.2.tar.xz ++++++ ++++ 2350 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 libqt5-qtx11extras for openSUSE:Factory
by root＠hilbert.suse.de 08 Sep '14

08 Sep '14

Hello community, here is the log from the commit of package libqt5-qtx11extras for openSUSE:Factory checked in at 2014-09-08 21:28:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtx11extras (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtx11extras" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtx11extras/libqt5-qtx11extras.changes 2014-06-30 21:50:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new/libqt5-qtx11extras.changes 2014-09-08 21:28:55.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 5.3.2~git20140904 (rd8bc98b): + * Tip of the bugfix 5.3.2 branch: + * Bump version + +------------------------------------------------------------------- Old: ---- qtx11extras-opensource-src-5.3.1.tar.xz New: ---- qtx11extras-opensource-src-5.3.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtx11extras.spec ++++++ --- /var/tmp/diff_new_pack.svfNO1/_old 2014-09-08 21:28:56.000000000 +0200 +++ /var/tmp/diff_new_pack.svfNO1/_new 2014-09-08 21:28:56.000000000 +0200 @@ -16,21 +16,17 @@ # -%define qt5_snapshot 0 +%define qt5_snapshot 1 %define libname libQt5X11Extras5 Name: libqt5-qtx11extras -Version: 5.3.1 +Version: 5.3.2~git20140904 Release: 0 %define base_name libqt5 -%define real_version 5.3.1 -%define so_version 5.3.1 -%if %qt5_snapshot -%define tar_version qtx11extras-%{real_version} -%else +%define real_version 5.3.2 +%define so_version 5.3.2 %define tar_version qtx11extras-opensource-src-%{real_version} -%endif Source: %{tar_version}.tar.xz Source1: baselibs.conf BuildRequires: fdupes @@ -54,11 +50,7 @@ handling. %prep -%if %qt5_snapshot -%setup -q -n qtx11extras-%{real_version} -%else %setup -q -n qtx11extras-opensource-src-%{real_version} -%endif %package -n %libname Summary: Qt 5 X11 Extras Addon ++++++ qtx11extras-opensource-src-5.3.1.tar.xz -> qtx11extras-opensource-src-5.3.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.3.1/.qmake.conf new/qtx11extras-opensource-src-5.3.2/.qmake.conf --- old/qtx11extras-opensource-src-5.3.1/.qmake.conf 2014-06-19 12:08:28.000000000 +0200 +++ new/qtx11extras-opensource-src-5.3.2/.qmake.conf 2014-06-18 00:37:12.000000000 +0200 @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.3.1 +MODULE_VERSION = 5.3.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.3.1/.tag new/qtx11extras-opensource-src-5.3.2/.tag --- old/qtx11extras-opensource-src-5.3.1/.tag 2014-06-19 12:08:28.000000000 +0200 +++ new/qtx11extras-opensource-src-5.3.2/.tag 2014-06-18 00:37:12.000000000 +0200 @@ -1 +1 @@ -2d84caf5ef1b5dace0d678df4581db3c955be6ee +61e0824f2490b2a5f67117cc005318887f6f237c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/QX11Info new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/QX11Info --- old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/QX11Info 2014-06-19 12:08:28.000000000 +0200 +++ new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/QX11Info 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qx11info_x11.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/QtX11Extras new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/QtX11Extras --- old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/QtX11Extras 2014-06-19 12:08:28.000000000 +0200 +++ new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/QtX11Extras 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -#ifndef QT_QTX11EXTRAS_MODULE_H -#define QT_QTX11EXTRAS_MODULE_H -#include <QtX11Extras/QtX11ExtrasDepends> -#include "qtx11extrasglobal.h" -#include "qtx11extrasversion.h" -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/QtX11ExtrasVersion new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/QtX11ExtrasVersion --- old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/QtX11ExtrasVersion 2014-06-19 12:08:28.000000000 +0200 +++ new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/QtX11ExtrasVersion 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qtx11extrasversion.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/headers.pri new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/headers.pri --- old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/headers.pri 2014-06-19 12:08:28.000000000 +0200 +++ new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/headers.pri 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -SYNCQT.HEADER_FILES = qtx11extrasglobal.h qx11info_x11.h ../../include/QtX11Extras/qtx11extrasversion.h ../../include/QtX11Extras/QtX11Extras -SYNCQT.HEADER_CLASSES = ../../include/QtX11Extras/QX11Info ../../include/QtX11Extras/QtX11ExtrasVersion -SYNCQT.PRIVATE_HEADER_FILES = -SYNCQT.QPA_HEADER_FILES = -SYNCQT.INJECTIONS = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/qtx11extrasglobal.h new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/qtx11extrasglobal.h --- old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/qtx11extrasglobal.h 2014-06-19 12:08:28.000000000 +0200 +++ new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/qtx11extrasglobal.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/x11extras/qtx11extrasglobal.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/qtx11extrasversion.h new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/qtx11extrasversion.h --- old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/qtx11extrasversion.h 2014-06-19 12:08:28.000000000 +0200 +++ new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/qtx11extrasversion.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -/* This file was generated by syncqt. */ -#ifndef QT_QTX11EXTRAS_VERSION_H -#define QT_QTX11EXTRAS_VERSION_H - -#define QTX11EXTRAS_VERSION_STR "5.3.1" - -#define QTX11EXTRAS_VERSION 0x050301 - -#endif // QT_QTX11EXTRAS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/qx11info_x11.h new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/qx11info_x11.h --- old/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/qx11info_x11.h 2014-06-19 12:08:28.000000000 +0200 +++ new/qtx11extras-opensource-src-5.3.2/include/QtX11Extras/qx11info_x11.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/x11extras/qx11info_x11.h" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0