April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit e17-theme-a-os-agust-v3 for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package e17-theme-a-os-agust-v3 for openSUSE:Factory checked in at 2014-04-26 09:59:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/e17-theme-a-os-agust-v3 (Old) and /work/SRC/openSUSE:Factory/.e17-theme-a-os-agust-v3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "e17-theme-a-os-agust-v3" Changes: -------- New Changes file: --- /dev/null 2014-04-17 09:46:44.096034755 +0200 +++ /work/SRC/openSUSE:Factory/.e17-theme-a-os-agust-v3.new/e17-theme-a-os-agust-v3.changes 2014-04-26 09:59:57.000000000 +0200 @@ -0,0 +1,30 @@ +------------------------------------------------------------------- +Fri Apr 18 06:01:09 UTC 2014 - simon(a)simotek.net + +- rename to e17-theme-* to make life less confusing + +------------------------------------------------------------------- +Sat Dec 14 23:15:27 UTC 2013 - sleep_walker(a)suse.cz + +- edje is separated now, require only that + +------------------------------------------------------------------- +Sun Dec 1 09:18:24 UTC 2013 - simon(a)simotek.net + +- build from efl 1.8.0 + +------------------------------------------------------------------- +Thu Jan 10 22:54:32 UTC 2013 - sleep_walker(a)suse.cz + +- add AUTHORS and COPYING + +------------------------------------------------------------------- +Wed Jan 9 11:47:32 UTC 2013 - sleep_walker(a)suse.cz + +- provide e17-theme + +------------------------------------------------------------------- +Thu Jan 3 00:05:27 UTC 2013 - sleep_walker(a)suse.cz + +- let there be e-theme-a-os-agust-v3! + New: ---- A-OS-Agust-V3.tar.bz2 e17-theme-a-os-agust-v3.changes e17-theme-a-os-agust-v3.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ e17-theme-a-os-agust-v3.spec ++++++ # # spec file for package e-theme-a-os-agust-v3 # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) specCURRENT_YEAR 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: e17-theme-a-os-agust-v3 Version: 1 Release: 0 Summary: A-OS-Agust-V3 theme for E17 License: GPL-2.0 Group: System/GUI/Other Url: https://en.opensuse.org/Portal:Enlightenment Source: A-OS-Agust-V3.tar.bz2 BuildRequires: edje Requires: e17 Provides: e17-theme BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description A-OS-Agust-V3, theme for Enlightenment 0.17. %prep %setup -q -n A-OS-Agust-V3 %build ./build.sh -v %install install -m 0755 -d %{buildroot}%{_datadir}/enlightenment/data/themes install -m 0644 -t %{buildroot}%{_datadir}/enlightenment/data/themes A-OS-Agust-V3.edj %files %defattr(-,root,root) %doc AUTHORS COPYING %{_datadir}/enlightenment %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 cups-filters for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package cups-filters for openSUSE:Factory checked in at 2014-04-26 09:59:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups-filters (Old) and /work/SRC/openSUSE:Factory/.cups-filters.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cups-filters" Changes: -------- --- /work/SRC/openSUSE:Factory/cups-filters/cups-filters.changes 2014-04-11 13:24:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cups-filters.new/cups-filters.changes 2014-04-26 09:59:44.000000000 +0200 @@ -1,0 +2,25 @@ +Thu Apr 24 11:23:43 CEST 2014 - jsmeix(a)suse.de + +- Split cups-browsed into a cups-filters-cups-browsed sub-package + so that cups-browsed can be installed without all the other + stuff from cups-filters (bnc#873204). +- Have libcupsfilters.so.* in the cups-filters-ghostscript + sub-package because gstoraster is linked with libcupsfilters + so that now cups-filters-foomatic-rip requires + cups-filters-ghostscript which is still o.k. because + cups-filters-ghostscript does not require cups-filters + (cf. the entry dated "Thu Apr 10 10:22:25 CEST 2014" below). +- Do no longer rename installed /usr/share/cups/banners/* files + and the installed /usr/share/cups/data/testprint + (cf. the entry dated "Fri Aug 30 12:53:57 CEST 2013" below) + because since CUPS 1.7.2 those files are no longer provided + in our cups RPM package because since CUPS >= 1.6 + the CUPS banners and testprint do no longer work because + there is no longer a filter for Linux that can convert + the CUPS banner files. Since CUPS >= 1.6 only the banners + and testprint in cups-filters work (bnc#873376). + For CUPS <= 1.5.4 (where CUPS banners and testprint works) + this does not make a difference because the cups-filters + main package conflicts with CUPS <= 1.5.4. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-filters.spec ++++++ --- /var/tmp/diff_new_pack.A6hr06/_old 2014-04-26 09:59:45.000000000 +0200 +++ /var/tmp/diff_new_pack.A6hr06/_new 2014-04-26 09:59:45.000000000 +0200 @@ -92,28 +92,20 @@ %systemd_requires # test requires BuildRequires: dejavu-fonts -# Require the exact matching version-release of the cups-filters-ghostscript sub-package -# because all cups-filters software is built from one same source tar ball -# and there could be whatever subtle internal dependencies. -# The exact matching version-release of the cups-filters-ghostscript sub-package is available -# on the same package repository where the cups-filters main package is because -# all are built simulaneously from the same cups-filters source package -# and all required packages are provided on the same repository: -Requires: cups-filters-ghostscript = %{version}-%{release} -# Because foomatic-rip is linked with libcupsfilters.so -# that library is in the cups-filters-foomatic-rip sub-package -# (see the cups-filters-foomatic-rip sub-package file section). +# Because gstoraster is linked with libcupsfilters.so +# that library is in the cups-filters-ghostscript sub-package +# (see the cups-filters-ghostscript sub-package file section). # But many other filters in the cups-filters main package are also # linked with with libcupsfilters.so so that the cups-filters main package -# requires the cups-filters-foomatic-rip sub-package. To be on the safe side explicitly -# require the exact matching version-release of the cups-filters-foomatic-rip sub-package +# requires the cups-filters-ghostscript sub-package. To be on the safe side explicitly +# require the exact matching version-release of the cups-filters-ghostscript sub-package # because all cups-filters software is built from one same source tar ball # and there could be whatever subtle internal dependencies. -# The exact matching version-release of the cups-filters-foomatic-rip sub-package is available +# The exact matching version-release of the cups-filters-ghostscript sub-package is available # on the same package repository where the cups-filters main package is because # all are built simulaneously from the same cups-filters source package # and all required packages are provided on the same repository: -Requires: cups-filters-foomatic-rip = %{version}-%{release} +Requires: cups-filters-ghostscript = %{version}-%{release} # Conflict with CUPS < 1.6 because up to CUPS 1.5.4 # the following files are provided by the cups binary RPM package # /usr/lib/cups/filter/commandtoescpx @@ -130,6 +122,17 @@ # /usr/share/cups/ppdc/escp.h # /usr/share/cups/ppdc/pcl.h Conflicts: cups < 1.6 +# When a user installs the cups-filters main package, he usually expects +# to get "the whole cups-filters stuff" installed (i.e. also all sub-packages). +# To be on the safe side recommend the exact matching version-release +# of the cups-filters sub-packages because all cups-filters software +# is built from one same source tar ball and there could be whatever subtle internal dependencies. +# The exact matching version-release of the cups-filters sub-packages are available +# on the same package repository where the cups-filters main package is because +# all are built simulaneously from the same cups-filters source package +# and all required packages are provided on the same repository: +Recommends: cups-filters-foomatic-rip = %{version}-%{release} +Recommends: cups-filters-cups-browsed = %{version}-%{release} # /usr/bin/pdftops (provided by poppler-tools) # is needed (but not required for non-PostScript printers) # to print PDFs on PostScript printers because in this case @@ -174,6 +177,23 @@ %package foomatic-rip Summary: OpenPrinting CUPS filter foomatic-rip Group: Hardware/Printing +# Because gstoraster is linked with libcupsfilters.so +# that library is in the cups-filters-ghostscript sub-package +# (see the cups-filters-ghostscript sub-package file section). +# But foomatic-rip is also linked with libcupsfilters.so +# so that the cups-filters-foomatic-rip sub-package requires +# the cups-filters-ghostscript sub-package. To be on the safe side explicitly +# require the exact matching version-release of the cups-filters-ghostscript sub-package +# because all cups-filters software is built from one same source tar ball +# and there could be whatever subtle internal dependencies. +# The exact matching version-release of the cups-filters-ghostscript sub-package is available +# on the same package repository where the cups-filters main package is because +# all are built simulaneously from the same cups-filters source package +# and all required packages are provided on the same repository: +Requires: cups-filters-ghostscript = %{version}-%{release} +# Provide the well known generic name "foomatic-rip" so that it is easier for users +# to find the RPM package name "cups-filters-foomatic-rip" that actually provides it: +Provides: foomatic-rip # Provide foomatic-filters with the exact foomatic_rip_version # see https://bugzilla.novell.com/show_bug.cgi?id=870621 # and conflict with any other foomatic-filters version because @@ -193,6 +213,36 @@ is separated in the sub-package cups-filters-foomatic-rip and only that sub-package conflicts with foomatic-filters. +%package cups-browsed +Summary: OpenPrinting cups-browsed for CUPS Browsing +Group: Hardware/Printing +# Do not conflict with CUPS < 1.6 regardless that up to CUPS 1.5.4 +# the CUPS Browsing functionality is provided by the cupsd +# because it can be disabled for the cupsd up to CUPS 1.5.4. +# Provide the well known generic name "cups-browsed" so that it is easier for users +# to find the RPM package name "cups-filters-cups-browsed" that actually provides it: +Provides: cups-browsed + +%description cups-browsed +Since CUPS >= 1.6 the CUPS Browsing functionality +is dropped in CUPS. The OpenPrinting cups-browsed +is a daemon running in parallel to the CUPS daemon +to provide again basic CUPS Browsing functionality. +This way basic CUPS Browsing works on clients +with CUPS >= 1.6 when there are remote CUPS servers +of version 1.5 and older in the network. +For each reported remote CUPS queue cups-browsed creates +a local raw queue pointing to the remote queue so that +it appears in local print dialogs and is also available +for printing via the command line. +Also high availability with redundant print servers is +supported. If there is more than one server providing +a print queue with the same name, cups-browsed uses the +first queue which appears and if this queue disappears, +cups-browsed switches to the queue of another server. +Load-balancing (what CUPS <= 1.5 did via implicit classes) +is not supported with cups-browsed. + %package devel Summary: Development files for cups-filters Group: Development/Libraries/C and C++ @@ -240,18 +290,6 @@ %install make install DESTDIR=%{buildroot} -# Rename installed /usr/share/cups/banners/* files -# and the installed /usr/share/cups/data/testprint -# because those files are also provided by CUPS -# but CUPS provides them in a different format and -# I (jsmeix(a)suse.de) not want to overwrite CUPS files but -# I do not like to delete the cups-filters version of those files -# instead I like to provide them at least for now as well -# so that we could evaluate which ones we may use finally: -for B in classified confidential secret standard topsecret unclassified -do mv %{buildroot}%{_datadir}/cups/banners/$B %{buildroot}%{_datadir}/cups/banners/$B.cups-filters -done -mv %{buildroot}%{_datadir}/cups/data/testprint %{buildroot}%{_datadir}/cups/data/testprint.cups-filters # https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc mkdir __doc mv %{buildroot}%{_datadir}/doc/cups-filters/* __doc @@ -272,22 +310,12 @@ # Not sure what is this good for rm -f %{buildroot}%{_bindir}/ttfread -%pre -%service_add_pre cups-browsed.service -exit 0 - %post /sbin/ldconfig -%service_add_post cups-browsed.service -exit 0 - -%preun -%service_del_preun cups-browsed.service exit 0 %postun /sbin/ldconfig -%service_del_preun cups-browsed.service exit 0 %pre ghostscript @@ -296,16 +324,16 @@ # The cups-filters main package contains them in /usr/share/cups/mime/cupsfilters.convs # but this contains all MIME conversion rules for the PDF printing workflow # that is used for CUPS since version 1.6 but not for traditional CUPS <= 1.5.4. -# The cups-filters-ghostscript sub-package is explicitly intended to be used +# The cups-filters-ghostscript sub-package is explicitly intended to be also used # for traditional CUPS <= 1.5.4 (see the cups-filters-ghostscript sub-package description) # so that we need to provide MIME conversion rules for gstoraster in a special way # that gets overwritten when the cups-filters main package is installed # after the cups-filters-ghostscript sub-package. Therefore we create # the traditional MIME conversion rules for gstoraster that were provided -# in Ghostscript up to version 9.07 in /etc/cups/gstoraster.convs but -# we use the MIME conversions file /usr/share/cups/mime/cupsfilters.convs +# in Ghostscript up to version 9.07 in /etc/cups/gstoraster.convs and +# we use the same file name /usr/share/cups/mime/cupsfilters.convs # that is also used by the cups-filters main package so that its installation -# will overwrite the traditional MIME conversion rules for gstoraster +# will overwrite the traditional MIME conversion rules for gstoraster in that file # by the new MIME conversion rules from cups-filters. To be on the safe side # do not overwrite an existing /usr/share/cups/mime/cupsfilters.convs file # (e.g. when cups-filters was installed before cups-filters-ghostscript). @@ -320,6 +348,30 @@ fi exit 0 +%post ghostscript +/sbin/ldconfig +exit 0 + +%postun ghostscript +/sbin/ldconfig +exit 0 + +%pre cups-browsed +%service_add_pre cups-browsed.service +exit 0 + +%post cups-browsed +%service_add_post cups-browsed.service +exit 0 + +%preun cups-browsed +%service_del_preun cups-browsed.service +exit 0 + +%postun cups-browsed +%service_del_preun cups-browsed.service +exit 0 + %files # The files sections list all mandatory files explicitly one by one. # In particular all executables are listed explicitly. @@ -334,10 +386,6 @@ %defattr(-,root,root) %doc __doc/README __doc/AUTHORS __doc/NEWS __doc/COPYING __doc/fontembed.README %config(noreplace) %{_sysconfdir}/fonts/conf.d/99pdftoopvp.conf -%config(noreplace) %{_sysconfdir}/cups/cups-browsed.conf -%{_sbindir}/cups-browsed -%{_sbindir}/rccups-browsed -%{_unitdir}/cups-browsed.service %dir /usr/lib/cups %dir /usr/lib/cups/backend %attr(0755,root,root) /usr/lib/cups/backend/parallel @@ -377,16 +425,13 @@ %dir %{_datadir}/ppd %{_datadir}/ppd/cupsfilters %attr(0755,root,root) %{_libdir}/libfontembed.so.* -%{_mandir}/man5/cups-browsed.conf.5.gz -%{_mandir}/man8/cups-browsed.8.gz %files ghostscript # "ldd /usr/lib/cups/filter/gstoraster | grep cups" shows that -# gstoraster is not linked with /usr/lib/libcupsfilters.so.* -# so that it is o.k. not to have libcupsfilters.so.* -# in the cups-filters-ghostscript sub-package and -# the cups-filters-ghostscript sub-package would still not -# have a RPM requirement for the cups-filters main package +# gstoraster is linked with /usr/lib/libcupsfilters.so.* so that +# it must be in the cups-filters-ghostscript sub-package to ensure +# the cups-filters-ghostscript sub-package can be installed on its own +# without a RPM requirement for the cups-filters main package # which would cause file conflicts with CUPS <= 1.5.4 # see the cups-filters-ghostscript sub-package description. # /usr/lib/cups/filter/gstopxl is a bash script. @@ -395,23 +440,23 @@ %dir /usr/lib/cups/filter %attr(0755,root,root) /usr/lib/cups/filter/gstoraster %attr(0755,root,root) /usr/lib/cups/filter/gstopxl +%attr(0755,root,root) %{_libdir}/libcupsfilters.so.* %files foomatic-rip -# "ldd /usr/lib/cups/filter/foomatic-rip | grep cups" shows that -# foomatic-rip is linked with /usr/lib/libcupsfilters.so.* -# so that /usr/lib/libcupsfilters.so.* must be -# in the cups-filters-foomatic-rip sub-package to ensure -# the cups-filters-foomatic-rip sub-package can be installed on its own -# without a RPM requirement for the cups-filters main package -# which would cause conflicts with CUPS <= 1.5.4 in particular -# when building packages with CUPS <= 1.5.4 that have foomatic-rip -# as build requirement (e.g. hplip via "BuildRequires: foomatic-filters"). -%{_mandir}/man1/foomatic-rip.1.gz %defattr(-,root,root) %dir /usr/lib/cups %dir /usr/lib/cups/filter %attr(0755,root,root) /usr/lib/cups/filter/foomatic-rip -%attr(0755,root,root) %{_libdir}/libcupsfilters.so.* +%{_mandir}/man1/foomatic-rip.1.gz + +%files cups-browsed +%defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/cups/cups-browsed.conf +%{_sbindir}/cups-browsed +%{_sbindir}/rccups-browsed +%{_unitdir}/cups-browsed.service +%{_mandir}/man5/cups-browsed.conf.5.gz +%{_mandir}/man8/cups-browsed.8.gz %files devel %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit blender for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2014-04-26 09:59:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "blender" Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2014-04-13 13:14:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new/blender.changes 2014-04-26 09:59:40.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 14 08:03:29 UTC 2014 - stephan.barth(a)suse.com + +- update to bugfix version 2.70a +- fixed some paths in the spec file to reflect version number differences + +------------------------------------------------------------------- Old: ---- blender-2.70.tar.gz New: ---- blender-2.70a.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.o6AHBf/_old 2014-04-26 09:59:42.000000000 +0200 +++ /var/tmp/diff_new_pack.o6AHBf/_new 2014-04-26 09:59:42.000000000 +0200 @@ -24,9 +24,14 @@ %define DISTRIBUTABLE 1 Name: blender -Version: 2.70 +Version: 2.70a Release: 0 + +# blender has versions like x.xxy which have x.xx (notice the missing +# trailing y) in the directory path. This makes this additional variable +# necessary. %define _version 2.70 + Summary: A 3D Modelling And Rendering Package License: GPL-2.0+ Group: Productivity/Graphics/3D Editors @@ -142,7 +147,7 @@ %lang_package %prep -%setup -q +%setup -q -n %{name}-v%{version} %patch1 %if %DISTRIBUTABLE == 1 @@ -321,15 +326,15 @@ %files lang -f %{name}.lang %defattr (-, root, root) -%{_datadir}/%{name}/%{version}/datafiles/ +%{_datadir}/%{name}/%{_version}/datafiles/ %files %defattr (-, root, root) %{_bindir}/* %{_mandir}/man1/* %dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/%{version} -%{_datadir}/%{name}/%{version}/scripts/ +%dir %{_datadir}/%{name}/%{_version} +%{_datadir}/%{name}/%{_version}/scripts/ %{_datadir}/applications/blender.desktop %{_datadir}/applications/x-blend.desktop %{_datadir}/icons/hicolor/*/apps/blender.png ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.o6AHBf/_old 2014-04-26 09:59:42.000000000 +0200 +++ /var/tmp/diff_new_pack.o6AHBf/_new 2014-04-26 09:59:42.000000000 +0200 @@ -5,7 +5,7 @@ <size unit="G">6</size> </disk> <physicalmemory> - <size unit="M">1500</size> + <size unit="M">2000</size> </physicalmemory> </hardware> </constraints> ++++++ blender-2.70.tar.gz -> blender-2.70a.tar.gz ++++++ /work/SRC/openSUSE:Factory/blender/blender-2.70.tar.gz /work/SRC/openSUSE:Factory/.blender.new/blender-2.70a.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 baloo for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package baloo for openSUSE:Factory checked in at 2014-04-26 09:59:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/baloo (Old) and /work/SRC/openSUSE:Factory/.baloo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "baloo" Changes: -------- --- /work/SRC/openSUSE:Factory/baloo/baloo.changes 2014-04-22 07:37:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.baloo.new/baloo.changes 2014-04-26 09:59:30.000000000 +0200 @@ -1,0 +2,25 @@ +Sat Apr 26 01:06:24 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Add more upstream fixes: + 0001-Cleaner-Do-not-commit-each-time-after-1000-documents.patch (kde#333807) and + 0002-XapianSearchStore-Catch-the-database-modified-except.patch (kde#333761) + +------------------------------------------------------------------- +Wed Apr 23 18:57:50 UTC 2014 - tittiatcoke(a)gmail.com + +- Drop patch kauth.patch as that the security review has been + completed. + +- Loosen up the requires as that people might not want Baloo and + upstream doesn't want to implement an on-off switch, but + recommends to deinstall certain files. + +------------------------------------------------------------------- +Tue Apr 22 19:52:32 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added 0002-Cleaner-Remove-the-database-file-on-disabling.patch, + 0003-Use-QFile-encodeName-and-catch-some-exceptions.patch and + 0004-KCM-Show-the-home-folder-name-when-excluding-it.patch from + upstream to resolve various usability issues + +------------------------------------------------------------------- Old: ---- kauth.patch New: ---- 0001-Cleaner-Do-not-commit-each-time-after-1000-documents.patch 0002-Cleaner-Remove-the-database-file-on-disabling.patch 0002-XapianSearchStore-Catch-the-database-modified-except.patch 0003-Use-QFile-encodeName-and-catch-some-exceptions.patch 0004-KCM-Show-the-home-folder-name-when-excluding-it.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baloo.spec ++++++ --- /var/tmp/diff_new_pack.pkQ8GG/_old 2014-04-26 09:59:31.000000000 +0200 +++ /var/tmp/diff_new_pack.pkQ8GG/_new 2014-04-26 09:59:31.000000000 +0200 @@ -23,10 +23,18 @@ License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/KDE Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE tittiatcoke(a)gmail.com Don't build the filewatch_raiselimit to prevent security issues -Patch1: kauth.patch # PATCH-FIX-UPSTREAM 0001-Bug-333566-Quick-filter-in-KMail-4.13-stops-working-.patch -- fixes KMail searches with non-Latin characters Patch2: 0001-Bug-333566-Quick-filter-in-KMail-4.13-stops-working-.patch +# PATCH-FIX-UPSTREAM 0002-Cleaner-Remove-the-database-file-on-disabling.patch +Patch3: 0002-Cleaner-Remove-the-database-file-on-disabling.patch +# PATCH-FIX-UPSTREAM 0003-Use-QFile-encodeName-and-catch-some-exceptions.patch +Patch4: 0003-Use-QFile-encodeName-and-catch-some-exceptions.patch +# PATCH-FIX-UPSTREAM 0004-KCM-Show-the-home-folder-name-when-excluding-it.patch +Patch5: 0004-KCM-Show-the-home-folder-name-when-excluding-it.patch +# PATCH-FIX-UPSTREAM 0001-Cleaner-Do-not-commit-each-time-after-1000-documents.patch +Patch6: 0001-Cleaner-Do-not-commit-each-time-after-1000-documents.patch +# PATCH-FIX-UPSTREAM 0002-XapianSearchStore-Catch-the-database-modified-except.patch +Patch7: 0002-XapianSearchStore-Catch-the-database-modified-except.patch BuildRequires: kfilemetadata-devel >= %{version} BuildRequires: libakonadiprotocolinternals-devel BuildRequires: libattr-devel @@ -40,8 +48,8 @@ %package core Summary: Core components for Baloo Framework Group: System/GUI/KDE -Requires: %{name}-kioslaves = %{version} -Requires: %{name}-tools = %{version} +Recommends: %{name}-kioslaves = %{version} +Recommends: %{name}-tools = %{version} Requires: libxapian22 >= 1.2.17 %description core @@ -51,7 +59,7 @@ %package -n libbaloofiles4 Summary: Files library for Baloo Framework Group: System/GUI/KDE -Requires: %{name}-file = %{version} +Recommends: %{name}-file = %{version} %description -n libbaloofiles4 Baloo is a framework for searching and managing metadata. This @@ -69,7 +77,7 @@ %package -n libbaloopim4 Summary: PIM library for Baloo Framework Group: System/GUI/KDE -Requires: %{name}-pim = %{version} +Recommends: %{name}-pim = %{version} %description -n libbaloopim4 Baloo is a framework for searching and managing metadata. This @@ -87,6 +95,7 @@ %package kioslaves Summary: KIO slave components for Baloo Framework Group: System/GUI/KDE +Requires: %{name}-core = %{version} %description kioslaves Baloo is a framework for searching and managing metadata. This @@ -95,6 +104,7 @@ %package tools Summary: Aditional components for Baloo Framework Group: System/GUI/KDE +Requires: %{name}-core = %{version} %description tools Baloo is a framework for searching and managing metadata. This @@ -114,8 +124,12 @@ %prep %setup -q -%patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build %cmake_kde4 -d build @@ -169,13 +183,10 @@ %{_kde4_servicesdir}/baloo_filesearchstore.desktop %{_kde4_modulesdir}/baloo_filesearchstore.so %{_kde4_iconsdir}/hicolor/*/apps/baloo.png -%if 0 -# These files can only be activated once the security team did a full review %{_kde4_modulesdir}/libexec/kde_baloo_filewatch_raiselimit %{_kde4_datadir}/dbus-1/system-services/org.kde.baloo.filewatch.service %{_kde4_datadir}/polkit-1/actions/org.kde.baloo.filewatch.policy %{_kde4_sysconfdir}/dbus-1/system.d/org.kde.baloo.filewatch.conf -%endif %files kioslaves %defattr(-,root,root) ++++++ 0001-Cleaner-Do-not-commit-each-time-after-1000-documents.patch ++++++ >From 8b7b9cf036e9155a3eb3a15bbf70a5d7a78ea2f6 Mon Sep 17 00:00:00 2001 From: Vishesh Handa <me(a)vhanda.in> Date: Thu, 24 Apr 2014 19:29:21 +0200 Subject: [PATCH 1/3] Cleaner: Do not commit each time after 1000 documents Patch submitted by 191c4ec3(a)opayq.com BUG: 333807 FIXED-IN: 4.13.1 --- src/file/cleaner/cleaner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/file/cleaner/cleaner.cpp b/src/file/cleaner/cleaner.cpp index 21eb1cd..e7dca0b 100644 --- a/src/file/cleaner/cleaner.cpp +++ b/src/file/cleaner/cleaner.cpp @@ -82,7 +82,7 @@ void Cleaner::start() numDocuments++; } - if (numDocuments >= 1000) { + if (numDocuments && numDocuments % 1000 == 0) { m_commitQueue->commit(); } } -- 1.9.2 ++++++ 0002-Cleaner-Remove-the-database-file-on-disabling.patch ++++++ >From 2a8f6fbd54eae37c4689cdc630c5f98782733e1b Mon Sep 17 00:00:00 2001 From: Vishesh Handa <me(a)vhanda.in> Date: Tue, 22 Apr 2014 13:25:16 +0200 Subject: [PATCH 1/3] Cleaner: Remove the database file on disabling Instead of manually cleaning every file which would consume a lot of time and cpu. --- src/file/cleaner/main.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/file/cleaner/main.cpp b/src/file/cleaner/main.cpp index fa08071..dd26f88 100644 --- a/src/file/cleaner/main.cpp +++ b/src/file/cleaner/main.cpp @@ -29,9 +29,12 @@ #include <KComponentData> #include <QApplication> #include <QDBusConnection> +#include <QFile> +#include <QDir> #include <KDebug> #include <KStandardDirs> +#include <KConfigGroup> int main(int argc, char* argv[]) { @@ -58,6 +61,18 @@ int main(int argc, char* argv[]) const QString path = KGlobal::dirs()->localxdgdatadir() + "baloo/file/"; + KConfig config("baloofilerc"); + KConfigGroup group = config.group("Basic Settings"); + bool indexingEnabled = group.readEntry("Indexing-Enabled", true); + if (!indexingEnabled) { + QDir dir(path); + Q_FOREACH (const QString& file, dir.entryList(QDir::Files)) { + dir.remove(file); + } + QFile::remove(path); + return 0; + } + Database db; db.setPath(path); db.init(); -- 1.9.2 ++++++ 0002-XapianSearchStore-Catch-the-database-modified-except.patch ++++++ >From 0a3d303d726df0bc0f97e99d3116b8972f92bf00 Mon Sep 17 00:00:00 2001 From: Vishesh Handa <me(a)vhanda.in> Date: Fri, 25 Apr 2014 16:28:38 +0200 Subject: [PATCH 2/3] XapianSearchStore: Catch the database modified exception The database can get modified in the middle BUG: 333761 FIXED-IN: 4.13.1 --- src/xapian/xapiansearchstore.cpp | 69 +++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/src/xapian/xapiansearchstore.cpp b/src/xapian/xapiansearchstore.cpp index 0edf99a..76e3b1d 100644 --- a/src/xapian/xapiansearchstore.cpp +++ b/src/xapian/xapiansearchstore.cpp @@ -205,43 +205,52 @@ int XapianSearchStore::exec(const Query& query) if (!m_db) return 0; - QMutexLocker lock(&m_mutex); - try { - m_db->reopen(); - } catch (Xapian::DatabaseError& e) { - kWarning() << "Failed to reopen database" << dbPath() << ":" << QString::fromStdString(e.get_msg()); - return 0; - } + while (1) { + try { + QMutexLocker lock(&m_mutex); + try { + m_db->reopen(); + } catch (Xapian::DatabaseError& e) { + kWarning() << "Failed to reopen database" << dbPath() << ":" << QString::fromStdString(e.get_msg()); + return 0; + } - QTime queryGenerationTimer; - queryGenerationTimer.start(); + QTime queryGenerationTimer; + queryGenerationTimer.start(); - Xapian::Query xapQ = toXapianQuery(query.term()); - if (query.searchString().size()) { - QString str = query.searchString(); + Xapian::Query xapQ = toXapianQuery(query.term()); + if (query.searchString().size()) { + QString str = query.searchString(); - Xapian::Query q = constructSearchQuery(str); - xapQ = andQuery(xapQ, q); - } - xapQ = andQuery(xapQ, convertTypes(query.types())); - xapQ = andQuery(xapQ, constructFilterQuery(query.yearFilter(), query.monthFilter(), query.dayFilter())); - xapQ = applyCustomOptions(xapQ, query.customOptions()); - xapQ = finalizeQuery(xapQ); + Xapian::Query q = constructSearchQuery(str); + xapQ = andQuery(xapQ, q); + } + xapQ = andQuery(xapQ, convertTypes(query.types())); + xapQ = andQuery(xapQ, constructFilterQuery(query.yearFilter(), query.monthFilter(), query.dayFilter())); + xapQ = applyCustomOptions(xapQ, query.customOptions()); + xapQ = finalizeQuery(xapQ); + + Xapian::Enquire enquire(*m_db); + kDebug() << xapQ.get_description().c_str(); + enquire.set_query(xapQ); - Xapian::Enquire enquire(*m_db); - kDebug() << xapQ.get_description().c_str(); - enquire.set_query(xapQ); + kDebug() << "Query Generation" << queryGenerationTimer.elapsed(); - kDebug() << "Query Generation" << queryGenerationTimer.elapsed(); + Result& res = m_queryMap[m_nextId++]; + QTime timer; + timer.start(); + res.mset = enquire.get_mset(query.offset(), query.limit()); + res.it = res.mset.begin(); - Result& res = m_queryMap[m_nextId++]; - QTime timer; - timer.start(); - res.mset = enquire.get_mset(query.offset(), query.limit()); - res.it = res.mset.begin(); + kDebug() << "Exec" << timer.elapsed() << "msecs"; + return m_nextId-1; + } + catch (const Xapian::DatabaseModifiedError&) { + continue; + } + } - kDebug() << "Exec" << timer.elapsed() << "msecs"; - return m_nextId-1; + return 0; } void XapianSearchStore::close(int queryId) -- 1.9.2 ++++++ 0003-Use-QFile-encodeName-and-catch-some-exceptions.patch ++++++ >From 5a2e520a4f5db3a0d1180c41e1d0e29927b1cbe8 Mon Sep 17 00:00:00 2001 From: Montel Laurent <montel(a)kde.org> Date: Tue, 22 Apr 2014 13:24:27 +0200 Subject: [PATCH 2/3] Use QFile::encodeName and catch some exceptions --- src/file/lib/db.cpp | 3 ++- src/pim/agent/agent.cpp | 4 +++- src/pim/lib/contactcompleter.cpp | 4 +++- src/pim/lib/contactquery.cpp | 11 ++++++++++- src/pim/lib/emailquery.cpp | 4 +++- src/pim/lib/notequery.cpp | 11 ++++++++++- 6 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/file/lib/db.cpp b/src/file/lib/db.cpp index 15bd62b..10bf933 100644 --- a/src/file/lib/db.cpp +++ b/src/file/lib/db.cpp @@ -27,10 +27,11 @@ #include <QSqlQuery> #include <QSqlError> +#include <QFile> std::string fileIndexDbPath() { - return (KGlobal::dirs()->localxdgdatadir() + "baloo/file").toUtf8().constData(); + return QFile::encodeName(KGlobal::dirs()->localxdgdatadir() + "baloo/file").constData(); } QSqlDatabase fileMappingDb() { diff --git a/src/pim/agent/agent.cpp b/src/pim/agent/agent.cpp index 7de454e..8904d49 100644 --- a/src/pim/agent/agent.cpp +++ b/src/pim/agent/agent.cpp @@ -41,6 +41,8 @@ #include <KConfigGroup> #include <KLocalizedString> +#include <QFile> + namespace { QString dbPath(const QString& dbName) { QString basePath = "baloo"; @@ -144,7 +146,7 @@ qlonglong BalooIndexingAgent::indexedItemsInDatabase(const std::string& term, co { Xapian::Database db; try { - db = Xapian::Database(dbPath.toUtf8().constData()); + db = Xapian::Database(QFile::encodeName(dbPath).constData()); } catch (const Xapian::DatabaseError& e) { kError() << "Failed to open database" << dbPath << ":" << QString::fromStdString(e.get_msg()); return 0; diff --git a/src/pim/lib/contactcompleter.cpp b/src/pim/lib/contactcompleter.cpp index c7e011d..e841ddd 100644 --- a/src/pim/lib/contactcompleter.cpp +++ b/src/pim/lib/contactcompleter.cpp @@ -26,6 +26,8 @@ #include <KStandardDirs> #include <KDebug> +#include <QFile> + using namespace Baloo::PIM; ContactCompleter::ContactCompleter(const QString& prefix, int limit) @@ -40,7 +42,7 @@ QStringList ContactCompleter::complete() const QString dir = KGlobal::dirs()->localxdgdatadir() + "baloo/emailContacts/"; Xapian::Database db; try { - db = Xapian::Database(dir.toUtf8().constData()); + db = Xapian::Database(QFile::encodeName(dir).constData()); } catch (const Xapian::DatabaseError& e) { kWarning() << QString::fromStdString(e.get_type()) << QString::fromStdString(e.get_description()); diff --git a/src/pim/lib/contactquery.cpp b/src/pim/lib/contactquery.cpp index a30fb59..9740969 100644 --- a/src/pim/lib/contactquery.cpp +++ b/src/pim/lib/contactquery.cpp @@ -28,6 +28,8 @@ #include <KDebug> #include <KStandardDirs> +#include <QFile> + using namespace Baloo::PIM; class ContactQuery::Private { @@ -102,7 +104,14 @@ void ContactQuery::setMatchCriteria(ContactQuery::MatchCriteria m) ResultIterator ContactQuery::exec() { const QString dir = KGlobal::dirs()->localxdgdatadir() + "baloo/contacts/"; - Xapian::Database db(dir.toUtf8().constData()); + Xapian::Database db; + + try { + db = Xapian::Database(QFile::encodeName(dir).constData()); + } catch (const Xapian::DatabaseError& e) { + kWarning() << "Failed to open Xapian database:" << QString::fromStdString(e.get_error_string()); + return ResultIterator(); + } QList<Xapian::Query> m_queries; diff --git a/src/pim/lib/emailquery.cpp b/src/pim/lib/emailquery.cpp index e23f8b9..af25962 100644 --- a/src/pim/lib/emailquery.cpp +++ b/src/pim/lib/emailquery.cpp @@ -27,6 +27,8 @@ #include <KStandardDirs> +#include <QFile> + using namespace Baloo::PIM; class EmailQuery::Private @@ -184,7 +186,7 @@ ResultIterator EmailQuery::exec() const QString dir = KGlobal::dirs()->localxdgdatadir() + "baloo/email/"; Xapian::Database db; try { - db = Xapian::Database(dir.toUtf8().constData()); + db = Xapian::Database(QFile::encodeName(dir).constData()); } catch (const Xapian::DatabaseError& e) { kWarning() << "Failed to open Xapian database:" << QString::fromStdString(e.get_error_string()); return ResultIterator(); diff --git a/src/pim/lib/notequery.cpp b/src/pim/lib/notequery.cpp index 2257cc6..632fcd8 100644 --- a/src/pim/lib/notequery.cpp +++ b/src/pim/lib/notequery.cpp @@ -25,6 +25,8 @@ #include "xapian.h" #include <QList> +#include <QFile> + #include <KDebug> #include <KStandardDirs> @@ -77,7 +79,14 @@ int NoteQuery::limit() const ResultIterator NoteQuery::exec() { const QString dir = KGlobal::dirs()->localxdgdatadir() + "baloo/notes/"; - Xapian::Database db(dir.toUtf8().constData()); + + Xapian::Database db; + try { + db = Xapian::Database(QFile::encodeName(dir).constData()); + } catch (const Xapian::DatabaseError& e) { + kWarning() << "Failed to open Xapian database:" << QString::fromStdString(e.get_error_string()); + return ResultIterator(); + } QList<Xapian::Query> m_queries; -- 1.9.2 ++++++ 0004-KCM-Show-the-home-folder-name-when-excluding-it.patch ++++++ >From db1ad7bb243e74028ad2b26b5271220b382a9b31 Mon Sep 17 00:00:00 2001 From: Vishesh Handa <me(a)vhanda.in> Date: Tue, 22 Apr 2014 13:37:48 +0200 Subject: [PATCH 3/3] KCM: Show the home folder name when excluding it --- src/file/kcm/folderselectionwidget.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/file/kcm/folderselectionwidget.cpp b/src/file/kcm/folderselectionwidget.cpp index 1808e65..44d52ab 100644 --- a/src/file/kcm/folderselectionwidget.cpp +++ b/src/file/kcm/folderselectionwidget.cpp @@ -293,8 +293,13 @@ QString FolderSelectionWidget::getFolderDisplayName(const QString& url) const QString name = url; // Check Home Dir - if (url.startsWith(QDir::homePath())) { - name = url.mid(QDir::homePath().length() + 1); + QString homePath = QDir::homePath() + '/'; + if (url == homePath) { + return QDir(homePath).dirName(); + } + + if (url.startsWith(homePath)) { + name = url.mid(homePath.size()); } else { // Check Mount allMountPointsExcluded -- 1.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aqbanking for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package aqbanking for openSUSE:Factory checked in at 2014-04-26 09:59:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aqbanking (Old) and /work/SRC/openSUSE:Factory/.aqbanking.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aqbanking" Changes: -------- --- /work/SRC/openSUSE:Factory/aqbanking/aqbanking.changes 2014-03-31 20:42:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aqbanking.new/aqbanking.changes 2014-04-26 09:59:25.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 18 22:07:14 UTC 2014 - jcnengel(a)gmail.com + +- Update to 5.4.3beta + + Fix a bug in aqbanking-cli concerning standing orders + +------------------------------------------------------------------- Old: ---- aqbanking-5.4.2beta.tar.gz New: ---- aqbanking-5.4.3beta.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aqbanking.spec ++++++ --- /var/tmp/diff_new_pack.E0DOTR/_old 2014-04-26 09:59:26.000000000 +0200 +++ /var/tmp/diff_new_pack.E0DOTR/_new 2014-04-26 09:59:26.000000000 +0200 @@ -26,7 +26,7 @@ %define q4b_cfgmoddir %{fronts_libdir}/q4banking/cfgmodules Name: aqbanking -Version: 5.4.2beta +Version: 5.4.3beta Release: 0 Summary: Library for Online Banking Functions and Financial Data Import and Export License: GPL-2.0 or GPL-3.0 ++++++ aqbanking-5.4.2beta.tar.gz -> aqbanking-5.4.3beta.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.4.2beta/ChangeLog new/aqbanking-5.4.3beta/ChangeLog --- old/aqbanking-5.4.2beta/ChangeLog 2014-03-30 21:54:42.000000000 +0200 +++ new/aqbanking-5.4.3beta/ChangeLog 2014-04-17 23:00:20.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------ +2014-04-02 15:33:02 +0000 martin +Aqbanking-cli: Needed to fix the argument type +We now use char because the period type is expected to be a string. + +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2549 5c42a225-8b10-0410-9873-89b7810ad06e + +------------------------------------------------------------------ +2014-03-30 20:03:41 +0000 martin +Prepared release 5.4.2beta. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2548 5c42a225-8b10-0410-9873-89b7810ad06e + +------------------------------------------------------------------ 2014-03-30 00:10:53 +0000 martin CSV: Added a profile for SEPA debit notes. This profile can be used to import SEPA debit notes to be send to a bank. @@ -649,13 +661,3 @@ 2014-01-08 22:28:56 +0000 martin AqHBCI: Started working on job JobSepaDebitDatedMultiCreate. git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2450 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-01-08 22:27:46 +0000 martin -AqHBCI: Removed a duplicate line. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2449 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-01-08 22:26:37 +0000 martin -AqHBCI: Fixed limits for remote name in SEPA jobs. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2448 5c42a225-8b10-0410-9873-89b7810ad06e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.4.2beta/aqbanking.iss new/aqbanking-5.4.3beta/aqbanking.iss --- old/aqbanking-5.4.2beta/aqbanking.iss 2014-03-30 21:53:30.000000000 +0200 +++ new/aqbanking-5.4.3beta/aqbanking.iss 2014-04-17 22:57:33.000000000 +0200 @@ -8,7 +8,7 @@ [Setup] ; Using the name here directly because we want it capitalized AppName=AqBanking -AppVerName=AqBanking 5.4.2beta +AppVerName=AqBanking 5.4.3beta AppPublisher=AqBanking Development Team AppPublisherURL=http://sourceforge.net/projects/aqbanking AppSupportURL=http://sourceforge.net/support/getsupport.php?group_id=115695 @@ -18,7 +18,7 @@ DirExistsWarning=no InfoAfterFile=README LicenseFile=COPYING -OutputBaseFilename=aqbanking-5.4.2beta-setup +OutputBaseFilename=aqbanking-5.4.3beta-setup OutputDir=. UninstallFilesDir={app}\uninstall\aqbanking @@ -151,7 +151,7 @@ StringChange(FileString, '@'+'aqbanking_pkgdatadir@', pkgdatadir); StringChange(FileString, '@'+'AQBANKING_VERSION_MAJOR@', '5'); StringChange(FileString, '@'+'AQBANKING_VERSION_MINOR@', '4'); - StringChange(FileString, '@'+'AQBANKING_VERSION_PATCHLEVEL@', '2'); + StringChange(FileString, '@'+'AQBANKING_VERSION_PATCHLEVEL@', '3'); StringChange(FileString, '@'+'AQBANKING_VERSION_BUILD@', '0'); StringChange(FileString, '@'+'AQBANKING_VERSION_TAG@', 'beta'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.4.2beta/aqbanking.spec new/aqbanking-5.4.3beta/aqbanking.spec --- old/aqbanking-5.4.2beta/aqbanking.spec 2014-03-30 21:53:30.000000000 +0200 +++ new/aqbanking-5.4.3beta/aqbanking.spec 2014-04-17 22:57:33.000000000 +0200 @@ -2,7 +2,7 @@ # neededforbuild gwenhywfar gwenhywfar-devel ktoblzcheck python python-ctypes pyyxml libchipcard2-devel libchipcard2 pkgconfig gettext-devel libacl-devel libacl libattr-devel libattr %define name aqbanking -%define version 5.4.2beta +%define version 5.4.3beta %define dist %define disttag diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.4.2beta/configure new/aqbanking-5.4.3beta/configure --- old/aqbanking-5.4.2beta/configure 2014-03-30 21:53:25.000000000 +0200 +++ new/aqbanking-5.4.3beta/configure 2014-04-17 22:57:27.000000000 +0200 @@ -2729,7 +2729,7 @@ AQBANKING_VERSION_MAJOR=5 AQBANKING_VERSION_MINOR=4 -AQBANKING_VERSION_PATCHLEVEL=2 +AQBANKING_VERSION_PATCHLEVEL=3 AQBANKING_VERSION_BUILD=0 AQBANKING_VERSION_TAG="beta" @@ -2746,7 +2746,7 @@ AQBANKING_SO_CURRENT=38 AQBANKING_SO_AGE=4 -AQBANKING_SO_REVISION=2 +AQBANKING_SO_REVISION=3 AQBANKING_SO_EFFECTIVE="`echo \$(($AQBANKING_SO_CURRENT-$AQBANKING_SO_AGE))`" # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.4.2beta/configure.ac new/aqbanking-5.4.3beta/configure.ac --- old/aqbanking-5.4.2beta/configure.ac 2014-03-30 21:53:11.000000000 +0200 +++ new/aqbanking-5.4.3beta/configure.ac 2014-04-17 22:57:00.000000000 +0200 @@ -25,7 +25,7 @@ AQBANKING_VERSION_MAJOR=5 AQBANKING_VERSION_MINOR=4 -AQBANKING_VERSION_PATCHLEVEL=2 +AQBANKING_VERSION_PATCHLEVEL=3 AQBANKING_VERSION_BUILD=0 dnl "stable", "rcX", "betaX", "svn" AQBANKING_VERSION_TAG="beta" @@ -43,7 +43,7 @@ AQBANKING_SO_CURRENT=38 AQBANKING_SO_AGE=4 -AQBANKING_SO_REVISION=2 +AQBANKING_SO_REVISION=3 AQBANKING_SO_EFFECTIVE="`echo \$(($AQBANKING_SO_CURRENT-$AQBANKING_SO_AGE))`" # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.4.2beta/src/plugins/backends/aqofxconnect/version.h new/aqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/version.h --- old/aqbanking-5.4.2beta/src/plugins/backends/aqofxconnect/version.h 2014-03-30 21:53:30.000000000 +0200 +++ new/aqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/version.h 2014-04-17 22:57:33.000000000 +0200 @@ -16,11 +16,11 @@ #define AQOFXCONNECT_VERSION_MAJOR 5 #define AQOFXCONNECT_VERSION_MINOR 4 -#define AQOFXCONNECT_VERSION_PATCHLEVEL 2 +#define AQOFXCONNECT_VERSION_PATCHLEVEL 3 #define AQOFXCONNECT_VERSION_BUILD 0 #define AQOFXCONNECT_VERSION_TAG "beta" -#define AQOFXCONNECT_VERSION_FULL_STRING "5.4.2.0beta" -#define AQOFXCONNECT_VERSION_STRING "5.4.2" +#define AQOFXCONNECT_VERSION_FULL_STRING "5.4.3.0beta" +#define AQOFXCONNECT_VERSION_STRING "5.4.3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.4.2beta/src/tools/aqbanking-cli/transfer.c new/aqbanking-5.4.3beta/src/tools/aqbanking-cli/transfer.c --- old/aqbanking-5.4.2beta/src/tools/aqbanking-cli/transfer.c 2014-03-01 20:44:38.000000000 +0100 +++ new/aqbanking-5.4.3beta/src/tools/aqbanking-cli/transfer.c 2014-04-02 17:31:16.000000000 +0200 @@ -242,7 +242,7 @@ }, { GWEN_ARGS_FLAGS_HAS_ARGUMENT, - GWEN_ArgsType_Int, + GWEN_ArgsType_Char, "executionPeriod", 0, 1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.4.2beta/version.h new/aqbanking-5.4.3beta/version.h --- old/aqbanking-5.4.2beta/version.h 2014-03-30 21:53:30.000000000 +0200 +++ new/aqbanking-5.4.3beta/version.h 2014-04-17 22:57:33.000000000 +0200 @@ -13,15 +13,15 @@ #define AQBANKING_VERSION_MAJOR 5 #define AQBANKING_VERSION_MINOR 4 -#define AQBANKING_VERSION_PATCHLEVEL 2 +#define AQBANKING_VERSION_PATCHLEVEL 3 #define AQBANKING_VERSION_BUILD 0 #define AQBANKING_VERSION_TAG "beta" -#define AQBANKING_VERSION_FULL_STRING "5.4.2.0beta" -#define AQBANKING_VERSION_STRING "5.4.2" +#define AQBANKING_VERSION_FULL_STRING "5.4.3.0beta" +#define AQBANKING_VERSION_STRING "5.4.3" #define AQBANKING_SO_CURRENT 38 -#define AQBANKING_SO_REVISION 2 +#define AQBANKING_SO_REVISION 3 #define AQBANKING_SO_AGE 4 #define AQBANKING_SO_EFFECTIVE 34 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmicrohttpd for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libmicrohttpd for openSUSE:Factory checked in at 2014-04-26 09:58:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmicrohttpd (Old) and /work/SRC/openSUSE:Factory/.libmicrohttpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmicrohttpd" Changes: -------- --- /work/SRC/openSUSE:Factory/libmicrohttpd/libmicrohttpd.changes 2014-02-02 18:08:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libmicrohttpd.new/libmicrohttpd.changes 2014-04-26 09:58:46.000000000 +0200 @@ -1,0 +2,46 @@ +Thu Apr 24 07:32:10 UTC 2014 - dmueller(a)suse.com + +- remove dependency on gpg-offline, source validator already + does that + +------------------------------------------------------------------- +Mon Apr 21 06:44:06 UTC 2014 - tchvatal(a)suse.com + +- Version bump to 0.9.34: + * Drop tls patch seems to build fine + * Remove code for other distros we build against 13.1+ anywhere + within obs and it just clutters the spec. + * Explicitely name switches in configure to make sure things go + the desired way. + * Fix install of libmicrohttpspdy pc file. + + Added support for TCP FASTOPEN. + + Removed dependency on plibc for simpler compilation for W32. + + Added configure option "--disable-pipes" to use socketpairs + instead of pipes for signalling to child threads. Pipes are + always disabled on W32. + + Corrected some uses of 'int' vs. 'size_t'. + + MHD_USE_DUAL_STACK in libmicrohttpd currently just *inhibits + setting* the IPV6_V6ONLY socket option, but per Microsoft's + documentation the default on Windows is that this is enabled, thus + MHD_USE_DUAL_STACK will not work (since it leaves the + default). libmicrohttpd should probably just unconditionally set + IPV6_V6ONLY to the desired value when the option is available. + + Allow Keep-Alive with HTTP 1.0 (if explicitly requested), + and automatically set "Connection: Keep-Alive" in response + in this case as well. + + Adding explicit annotations to hide symbols that are not for + export in the C code (gcc 4.0 or higher only). + + Adding a few lines to avoid warnings from picky compilers. + +- Added patches: + * libmicrohttpd-0.9.34-spdy-pc.patch +- Dropped patches: + * libmicrohttpd-drop-test_tls_options.patch + +------------------------------------------------------------------- +Tue Mar 4 12:42:30 UTC 2014 - coolo(a)suse.com + +- do not run checks in parallel - they deadlock from time to time +- enable make debug to debug the problem on OBS in case it reappears + +------------------------------------------------------------------- Old: ---- libmicrohttpd-0.9.33.tar.gz libmicrohttpd-0.9.33.tar.gz.sig libmicrohttpd-drop-test_tls_options.patch New: ---- libmicrohttpd-0.9.34-spdy-pc.patch libmicrohttpd-0.9.34.tar.gz libmicrohttpd-0.9.34.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmicrohttpd.spec ++++++ --- /var/tmp/diff_new_pack.fzpmyI/_old 2014-04-26 09:58:46.000000000 +0200 +++ /var/tmp/diff_new_pack.fzpmyI/_new 2014-04-26 09:58:46.000000000 +0200 @@ -19,35 +19,29 @@ %global libmicrohttpd libmicrohttpd10 %global libmicrospdy libmicrospdy0 - Name: libmicrohttpd -Version: 0.9.33 +Version: 0.9.34 Release: 0 Summary: Small Embeddable HTTP Server Library License: LGPL-2.1+ Group: Productivity/Networking/Web/Servers Url: http://gnunet.org/libmicrohttpd/ - Source0: http://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz Source1: http://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz.sig Source2: libmicrohttpd.keyring -#PATCH-FIX-OPENSUSE: test_tls_options fails when running in OBS, so lets drop that one -Patch0: libmicrohttpd-drop-test_tls_options.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# PATCH-FIX-UPSTREAM: install spdy pc file, from Fedora and already upstream applied +Patch0: libmicrohttpd-0.9.34-spdy-pc.patch +# Autotools only due to above patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: libcurl-devel BuildRequires: libgcrypt-devel >= 1.2.4 -BuildRequires: libtasn1-devel -%if 0%{?suse_version} BuildRequires: libgnutls-devel -BuildRequires: libopenssl-devel +BuildRequires: libtasn1-devel +BuildRequires: libtool +BuildRequires: openssl-devel BuildRequires: pkg-config -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif -%else -BuildRequires: gnutls-devel -BuildRequires: pkgconfig -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GNU libmicrohttpd is a small C library that is supposed to make it easy to run @@ -76,7 +70,6 @@ application, check it out. %package -n %{libmicrohttpd} - Summary: Small embeddable http server library Group: System/libraries @@ -84,7 +77,6 @@ Shared library for %{name} (%{summary}). %package -n %{libmicrospdy} - Summary: Small embeddable http server library Group: System/libraries @@ -97,20 +89,20 @@ partially version 3 of SPDY. %package devel +Summary: Small Embeddable HTTP Server Library +Group: Development/Libraries/C and C++ Requires: %{libmicrohttpd} = %{version} Requires(post): info Requires(postun): info -Summary: Small Embeddable HTTP Server Library -Group: Development/Libraries/C and C++ %description devel Headers, pkg-config files, so link and other development files for %{name} (%{summary}). %package -n libmicrospdy-devel -Requires: %{libmicrospdy} = %{version} Summary: Small Embeddable HTTP Server Library Group: Development/Libraries/C and C++ +Requires: %{libmicrospdy} = %{version} %description -n libmicrospdy-devel Headers for libmicrospdy (%{summary}). @@ -126,27 +118,27 @@ * No error handling for curl requests. %prep -%if 0%{?suse_version} >= 1230 -%gpg_verify %{SOURCE1} -%endif %setup -q - -#XXX: test fail inside OBS only -%if 0%{?opensuse_bs} %patch0 -p1 -%endif +autoreconf -vi %build -%configure --disable-static \ - --enable-curl -%__make %{?_smp_mflags} +%configure \ + --enable-bauth --enable-dauth \ + --enable-epoll \ + --enable-messages --enable-postprocessor \ + --enable-https --enable-gnutls \ + --disable-static \ + --enable-curl \ + --enable-spdy +make %{?_smp_mflags} %install -make install DESTDIR="%buildroot" -find %{buildroot} -name "*.la" -delete +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print %check -%__make %{?_smp_mflags} check +make -d -j1 check %post -n %{libmicrohttpd} -p /sbin/ldconfig @@ -157,36 +149,13 @@ %postun -n %{libmicrospdy} -p /sbin/ldconfig %post devel -%if 0%{?fedora_version} -/sbin/install-info --info-dir=%{_infodir} --info-file=%{_infodir}/microhttpd.info%{ext_info} -/sbin/install-info --info-dir=%{_infodir} --info-file=%{_infodir}/microhttpd-tutorial.info%{ext_info} -%endif - -%if 0%{?mandriva_version} -%_install_info libmicrohttpd.info -%_install_info libmicrohttpd-tutorial.info -%endif -%if 0%{?suse_version} %install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} %install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} -%endif %postun devel -%if 0%{?fedora_version} || 0%{?scientificlinux_version} || 0%{?centos_version} -/sbin/install-info --delete --info-dir=%{_infodir} --info-file=%{_infodir}/microhttpd.info%{ext_info} -/sbin/install-info --delete --info-dir=%{_infodir} --info-file=%{_infodir}/microhttpd-tutorial.info%{ext_info} -%endif - -%if 0%{?mandriva_version} -%_remove_install_info libmicrohttpd.info -%_remove_install_info libmicrohttpd-tutorial.info -%endif - -%if 0%{?suse_version} %install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} %install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} -%endif %files -n %{libmicrohttpd} %defattr(-,root,root) @@ -209,14 +178,10 @@ %defattr(-,root,root) %{_includedir}/microspdy.h %{_libdir}/libmicrospdy.so +%{_libdir}/pkgconfig/libmicrospdy.pc %files -n microspdy2http %defattr(-,root,root) %attr(0755,root,root) %{_bindir}/microspdy2http -# Do NOT delete this cause I need it for Fedora & Mandriva too! -%if 0%{?fedora_version} || 0%{?scientificlinux_version} || 0%{?centos_version} -%exclude %{_infodir}/dir -%endif - %changelog ++++++ libmicrohttpd-0.9.34-spdy-pc.patch ++++++ diff -urN libmicrohttpd-0.9.34/configure.ac libmicrohttpd-0.9.34-spdy-pc/configure.ac --- libmicrohttpd-0.9.34/configure.ac 2014-02-24 23:13:03.000000000 +0100 +++ libmicrohttpd-0.9.34-spdy-pc/configure.ac 2014-03-13 16:47:58.733989222 +0100 @@ -640,6 +640,7 @@ AC_CONFIG_FILES([ libmicrohttpd.pc +libmicrospdy.pc Makefile contrib/Makefile doc/Makefile diff -urN libmicrohttpd-0.9.34/Makefile.am libmicrohttpd-0.9.34-spdy-pc/Makefile.am --- libmicrohttpd-0.9.34/Makefile.am 2013-05-05 20:48:18.000000000 +0200 +++ libmicrohttpd-0.9.34-spdy-pc/Makefile.am 2014-03-13 16:35:04.883473986 +0100 @@ -3,5 +3,5 @@ EXTRA_DIST = acinclude.m4 libmicrohttpd.pc.in libmicrospdy.pc.in pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libmicrohttpd.pc +pkgconfig_DATA = libmicrohttpd.pc libmicrospdy.pc ++++++ libmicrohttpd-0.9.33.tar.gz -> libmicrohttpd-0.9.34.tar.gz ++++++ ++++ 40235 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 psmisc for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package psmisc for openSUSE:Factory checked in at 2014-04-26 09:58:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psmisc (Old) and /work/SRC/openSUSE:Factory/.psmisc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "psmisc" Changes: -------- --- /work/SRC/openSUSE:Factory/psmisc/psmisc.changes 2014-03-27 06:16:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.psmisc.new/psmisc.changes 2014-04-26 09:58:44.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 25 00:59:39 CEST 2014 - ro(a)suse.de + +- add patch to fix fuser -M option active all the time (bnc#874983) + psmisc-git-3638cc55b4d08851faba46635d737b24d016665b.patch + +------------------------------------------------------------------- Old: ---- psmisc-22.20-upstream.patch psmisc-22.20.tar.gz New: ---- psmisc-git-3638cc55b4d08851faba46635d737b24d016665b.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psmisc.spec ++++++ --- /var/tmp/diff_new_pack.GAsNTy/_old 2014-04-26 09:58:45.000000000 +0200 +++ /var/tmp/diff_new_pack.GAsNTy/_new 2014-04-26 09:58:45.000000000 +0200 @@ -35,6 +35,8 @@ Patch1: %name-22.12-tigetstr.patch Patch2: %name-22.21-pstree.patch Patch42: %{name}-22.21-upstream.patch +# PATCH-FIX-UPSTREAM psmisc-git-3638cc55b4d08851faba46635d737b24d016665b.patch bnc#874983 +Patch43: %{name}-git-3638cc55b4d08851faba46635d737b24d016665b.patch %define nopeek s390 s390x ia64 %sparc hppa aarch64 @@ -54,6 +56,7 @@ %patch1 -p0 -b .tigetstr %patch2 -p0 -b .pstree %patch0 -p0 -b .0 +%patch43 -p1 -b .fuserfix %build autoreconf -fi ++++++ psmisc-git-3638cc55b4d08851faba46635d737b24d016665b.patch ++++++ commit 3638cc55b4d08851faba46635d737b24d016665b Author: Brad Jorsch <anomie(a)users.sourceforge.net> Date: Fri Feb 28 21:55:02 2014 +1100 Typo in fuser makes -M on all the time Brad found that fuser had the -M option on all the time. A simple but significant typo caused this, thanks the the patch. Bug-Debian: http://bugs.debian.org/740275 Signed-off-by: Craig Small <csmall(a)enc.com.au> ================================================================================ --- psmisc-22.21/ChangeLog +++ psmisc-22.21/ChangeLog @@ -1,3 +1,6 @@ +Changes in 22.22 +================ + * Fixed typo in fuser which has -M on Debian #740275 * Make usage of linked lists of devices found in /proc/self/mountinfo optional * Make timeout() in timeout.c work with shared mmap to --- psmisc-22.21/src/fuser.c +++ psmisc-22.21/src/fuser.c @@ -1151,7 +1151,7 @@ usage(_("No process specification given")); /* Check if -M flag was used and if so check mounts */ - if (opts * OPT_ISMOUNTPOINT) { + if (opts & OPT_ISMOUNTPOINT) { check_mountpoints(&mounts, &names_head, &names_tail); } -- 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-support for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-support for openSUSE:Factory checked in at 2014-04-26 06:06:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-support (Old) and /work/SRC/openSUSE:Factory/.yast2-support.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-support" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-support/yast2-support.changes 2013-10-19 11:21:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-support.new/yast2-support.changes 2014-04-26 06:06:41.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 24 08:54:37 UTC 2014 - jsrain(a)suse.cz + +- adjusted help text - name technical support correctly + (bnc#872123) +- 3.1.1 + +------------------------------------------------------------------- Old: ---- yast2-support-3.1.0.tar.bz2 New: ---- yast2-support-3.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-support.spec ++++++ --- /var/tmp/diff_new_pack.OKVEQs/_old 2014-04-26 06:06:42.000000000 +0200 +++ /var/tmp/diff_new_pack.OKVEQs/_new 2014-04-26 06:06:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-support # -# 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 @@ -17,7 +17,7 @@ Name: yast2-support -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-support-3.1.0.tar.bz2 -> yast2-support-3.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.1.0/CONTRIBUTING.md new/yast2-support-3.1.1/CONTRIBUTING.md --- old/yast2-support-3.1.0/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-support-3.1.1/CONTRIBUTING.md 2014-04-24 11:20:40.000000000 +0200 @@ -0,0 +1,87 @@ +YaST Contribution Guidelines +============================ + +YaST is an open source project and as such it welcomes all kinds of +contributions. If you decide to contribute, please follow these guidelines to +ensure the process is effective and pleasant both for you and YaST maintainers. + +There are two main forms of contribution: reporting bugs and performing code +changes. + +Bug Reports +----------- + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +or [GitHub issues](../../issues). (For Bugzilla, use the [simplified +registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) +if you don't have an account yet.) + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +that every bug will be fixed, but we'll try. + +When creating a bug report, please follow our [bug reporting +guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). + +Code Changes +------------ + +We welcome all kinds of code contributions, from simple bug fixes to significant +refactorings and implementation of new features. However, before making any +non-trivial contribution, get in touch with us first — this can prevent wasted +effort on both sides. Also, have a look at our [development +documentation](http://en.opensuse.org/openSUSE:YaST_development). + +To send us your code change, use GitHub pull requests. The workflow is as +follows: + + 1. Fork the project. + + 2. Create a topic branch based on `master`. + + 3. Implement your change, including tests (if possible). Make sure you adhere + to the [Ruby style + guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). + + 4. Make sure your change didn't break anything by building the RPM package + (`rake osc:build`). The build process includes running the full testsuite. + + 5. Publish the branch and create a pull request. + + 6. YaST developers will review your change and possibly point out issues. + Adapt the code under their guidance until they are all resolved. + + 7. Finally, the pull request will get merged or rejected. + +See also [GitHub's guide on +contributing](https://help.github.com/articles/fork-a-repo). + +If you want to do multiple unrelated changes, use separate branches and pull +requests. + +Do not change the `VERSION` and `*.changes` files as this could lead to +conflicts. + +### Commits + +Each commit in the pull request should do only one thing, which is clearly +described by its commit message. Especially avoid mixing formatting changes and +functional changes into one commit. When writing commit messages, adhere to +[widely used +conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). + +If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +you mention it in the commit message for cross-reference. Use format like +bnc#775814 or gh#yast/yast-foo#42. See also [GitHub +autolinking](https://help.github.com/articles/github-flavored-markdown#references) +and [openSUSE abbreviation +reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations). + +Additional Information +---------------------- + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +We'll do our best to provide a timely and accurate answer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.1.0/package/yast2-support.changes new/yast2-support-3.1.1/package/yast2-support.changes --- old/yast2-support-3.1.0/package/yast2-support.changes 2013-10-16 10:16:10.000000000 +0200 +++ new/yast2-support-3.1.1/package/yast2-support.changes 2014-04-24 11:20:40.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 24 08:54:37 UTC 2014 - jsrain(a)suse.cz + +- adjusted help text - name technical support correctly + (bnc#872123) +- 3.1.1 + +------------------------------------------------------------------- Thu Sep 19 17:29:23 UTC 2013 - lslezak(a)suse.cz - do not use *.spec.in template, use *.spec file with RPM macros diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.1.0/package/yast2-support.spec new/yast2-support-3.1.1/package/yast2-support.spec --- old/yast2-support-3.1.0/package/yast2-support.spec 2013-10-16 10:16:10.000000000 +0200 +++ new/yast2-support-3.1.1/package/yast2-support.spec 2014-04-24 11:20:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-support -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-3.1.0/src/include/support/helps.rb new/yast2-support-3.1.1/src/include/support/helps.rb --- old/yast2-support-3.1.0/src/include/support/helps.rb 2013-10-16 10:16:10.000000000 +0200 +++ new/yast2-support-3.1.1/src/include/support/helps.rb 2014-04-24 11:20:40.000000000 +0200 @@ -73,7 +73,7 @@ "\n" + "<big>Opening Novell Support Center</big> \n" + "To start a Web browser that opens the Novell Support Center Portal, use Open Novell Support Center.\n" + - "You can then open a Service Request with Novell Technical Support. Make sure you write down\n" + + "You can then open a Service Request with Global Technical Support. Make sure you write down\n" + "the Service Request number to include in the supportconfig data upload.\n" ) + # Ovreview dialog help 2/3 @@ -84,7 +84,7 @@ _( "<big>Uploading Collected Data</big> \n" + "To upload the data already collected to a server, use Upload Data.\n" + - "The server may or may not be Novell Technical Support." + "The server may or may not be Global Technical Support." ), # Configure1 dialog help 1/3 "support_params" => _( @@ -131,7 +131,7 @@ ) + # Contact dialog help 4/4 _( - "Note: If you are uploading a supportconfig tarball to Novell Technical Support,\nmake sure you include the Novell 11-digit service request number from your open service request.\n" + "Note: If you are uploading a supportconfig tarball to Global Technical Support,\nmake sure you include the Novell 11-digit service request number from your open service request.\n" ), # Collecting data dialkog help 1/1 "collecting" => _( @@ -146,7 +146,7 @@ # Configure1 dialog help 1/3 "upload_save" => Ops.add( _( - "<big>Upload supportconfig tarball to Novell Technical Support</big> \n" + + "<big>Upload supportconfig tarball to Global Technical Support</big> \n" + "If you want to store a copy of the supportconfig tarball, select the target\n" + "directory and make sure that this option is checked.\n" + " \n" @@ -171,7 +171,7 @@ ), "upload_select" => Ops.add( _( - "<big>Upload supportconfig tarball to Novell Technical Support</big> \n" + + "<big>Upload supportconfig tarball to Global Technical Support</big> \n" + "If you have already created the supportconfig tarball, write the full path\n" + "into the Package with log files field.\n" + " \n" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xf86-video-ast for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package xf86-video-ast for openSUSE:Factory checked in at 2014-04-26 06:06:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-ast (Old) and /work/SRC/openSUSE:Factory/.xf86-video-ast.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-ast" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-ast/xf86-video-ast.changes 2014-03-18 14:07:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-ast.new/xf86-video-ast.changes 2014-04-26 06:06:34.000000000 +0200 @@ -1,0 +2,28 @@ +Thu Apr 24 10:40:58 UTC 2014 - eich(a)suse.com + +- Updated to Version 0.99.9: + This obsoletes: + * u_ast-fix-falling-back-after-kernel-check.patch + * u_Fixed-driver-name-in-error-message-about-KMS-active.patch + It adds support for the AST 2400 chip as well as for the DP501 (and + some other) encoders (bnc#871134). +- Added clean up patches: + * Fix compiler warnings: + u_01-Fix-compiler-warnings-get-rid-if-xf86PciInfo-h.patch + u_02-Fix-compiler-warnings-get-rid-of-deprecated-IOADDRESS.patch + u_03-Fix-compiler-warnings-add-DrawablePtr-argument-to-ASTPutImage.patch + * Clean up namespace: + u_04-Clean-up-namespace-in-ast_vgatools.c.patch + u_05-Clean-up-namespace-in-ast_2dtool.c.patch + u_06-Clean-up-namespace-in-ast_cursor.c.patch + u_07-Clean-up-namespace-in-ast_mode.c.patch + u_08-Clean-up-namespace-in-ast_accel.c.patch + u_09-Clean-up-namespace-in-ast_tool.c.patch + * Misc cleanup: + u_10-Include-local-headers-only-when-needed.patch + u_11-Fix-typo.patch + u_12-Fix-ABI-version-conflict-in-xf86UnclaimPciSlot.patch + u_13-Move-firmware-for-DP501-to-a-separate-file.patch + u_14-Add-_AST_H_-define-to-ast.h.patch + +------------------------------------------------------------------- Old: ---- u_Fixed-driver-name-in-error-message-about-KMS-active.patch u_ast-fix-falling-back-after-kernel-check.patch xf86-video-ast-0.98.0.tar.bz2 New: ---- u_01-Fix-compiler-warnings-get-rid-if-xf86PciInfo-h.patch u_02-Fix-compiler-warnings-get-rid-of-deprecated-IOADDRESS.patch u_03-Fix-compiler-warnings-add-DrawablePtr-argument-to-ASTPutImage.patch u_04-Clean-up-namespace-in-ast_vgatools.c.patch u_05-Clean-up-namespace-in-ast_2dtool.c.patch u_06-Clean-up-namespace-in-ast_cursor.c.patch u_07-Clean-up-namespace-in-ast_mode.c.patch u_08-Clean-up-namespace-in-ast_accel.c.patch u_09-Clean-up-namespace-in-ast_tool.c.patch u_10-Include-local-headers-only-when-needed.patch u_11-Fix-typo.patch u_12-Fix-ABI-version-conflict-in-xf86UnclaimPciSlot.patch u_13-Move-firmware-for-DP501-to-a-separate-file.patch u_14-Add-_AST_H_-define-to-ast.h.patch xf86-video-ast-0.99.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-ast.spec ++++++ --- /var/tmp/diff_new_pack.K6w3RM/_old 2014-04-26 06:06:35.000000000 +0200 +++ /var/tmp/diff_new_pack.K6w3RM/_new 2014-04-26 06:06:35.000000000 +0200 @@ -17,15 +17,27 @@ Name: xf86-video-ast -Version: 0.98.0 +Version: 0.99.9 Release: 0 Summary: ASpeed Technologies video driver for the Xorg X server License: MIT Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.t… -Patch0: u_ast-fix-falling-back-after-kernel-check.patch -Patch1: u_Fixed-driver-name-in-error-message-about-KMS-active.patch +Patch1: u_01-Fix-compiler-warnings-get-rid-if-xf86PciInfo-h.patch +Patch2: u_02-Fix-compiler-warnings-get-rid-of-deprecated-IOADDRESS.patch +Patch3: u_03-Fix-compiler-warnings-add-DrawablePtr-argument-to-ASTPutImage.patch +Patch4: u_04-Clean-up-namespace-in-ast_vgatools.c.patch +Patch5: u_05-Clean-up-namespace-in-ast_2dtool.c.patch +Patch6: u_06-Clean-up-namespace-in-ast_cursor.c.patch +Patch7: u_07-Clean-up-namespace-in-ast_mode.c.patch +Patch8: u_08-Clean-up-namespace-in-ast_accel.c.patch +Patch9: u_09-Clean-up-namespace-in-ast_tool.c.patch +Patch10: u_10-Include-local-headers-only-when-needed.patch +Patch11: u_11-Fix-typo.patch +Patch12: u_12-Fix-ABI-version-conflict-in-xf86UnclaimPciSlot.patch +Patch13: u_13-Move-firmware-for-DP501-to-a-separate-file.patch +Patch14: u_14-Add-_AST_H_-define-to-ast.h.patch BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) BuildRequires: pkgconfig(pciaccess) >= 0.8.0 @@ -48,8 +60,20 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 %build %configure ++++++ u_01-Fix-compiler-warnings-get-rid-if-xf86PciInfo-h.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Tue Apr 22 11:38:10 2014 +0200 Subject: [PATCH 1/14]Fix compiler warnings: get rid if xf86PciInfo,h Patch-Mainline: to be upstreamed Git-commit: 1af0ec68407ff1ea45fc03bab58acde669da07be Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <eich(a)suse.com> xf86PciInfo.h is not needed in the ASpeed driver at all. Signed-off-by: Egbert Eich <eich(a)suse.de> --- src/ast_2dtool.c | 1 - src/ast_accel.c | 1 - src/ast_cursor.c | 1 - src/ast_driver.c | 1 - src/ast_mode.c | 1 - src/ast_tool.c | 1 - src/ast_vgatool.c | 1 - 7 files changed, 7 deletions(-) diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c index 210d75c..47f0d64 100644 --- a/src/ast_2dtool.c +++ b/src/ast_2dtool.c @@ -36,7 +36,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ diff --git a/src/ast_accel.c b/src/ast_accel.c index 71eeb79..3bfe7ee 100644 --- a/src/ast_accel.c +++ b/src/ast_accel.c @@ -36,7 +36,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ diff --git a/src/ast_cursor.c b/src/ast_cursor.c index 80d787a..7bfa15f 100644 --- a/src/ast_cursor.c +++ b/src/ast_cursor.c @@ -36,7 +36,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ diff --git a/src/ast_driver.c b/src/ast_driver.c index 5f7fa8e..c2ba129 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -40,7 +40,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ diff --git a/src/ast_mode.c b/src/ast_mode.c index 964fe7a..8c3d828 100644 --- a/src/ast_mode.c +++ b/src/ast_mode.c @@ -36,7 +36,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ diff --git a/src/ast_tool.c b/src/ast_tool.c index 7f1362e..1e1cb6b 100644 --- a/src/ast_tool.c +++ b/src/ast_tool.c @@ -36,7 +36,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c index 73d379c..8522a6f 100644 --- a/src/ast_vgatool.c +++ b/src/ast_vgatool.c @@ -36,7 +36,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ ++++++ u_02-Fix-compiler-warnings-get-rid-of-deprecated-IOADDRESS.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Tue Apr 22 11:41:07 2014 +0200 Subject: [PATCH 2/14]Fix compiler warnings: get rid of deprecated IOADDRESS Patch-Mainline: to be upstreamed Git-commit: a186bd0eafa8f2f6eb0db39fd046591bf2d3e507 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <eich(a)suse.com> For newer ABI versions IOADDRESS can be replaced by int which is big enough to hold an PIO offset. Signed-off-by: Egbert Eich <eich(a)suse.de> --- src/ast.h | 6 ++++-- src/ast_driver.c | 18 ++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ast.h b/src/ast.h index cbe62fb..3b56a6c 100644 --- a/src/ast.h +++ b/src/ast.h @@ -261,9 +261,11 @@ typedef struct _ASTRec { unsigned long FbMapSize; unsigned long MMIOMapSize; - IOADDRESS IODBase; /* Base of PIO memory area */ - IOADDRESS PIOOffset; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 IOADDRESS RelocateIO; +#else + int RelocateIO; +#endif VIDEOMODE VideoModeInfo; ASTRegRec SavedReg; diff --git a/src/ast_driver.c b/src/ast_driver.c index c2ba129..639562d 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -570,23 +570,21 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n", (pScrn->chipset != NULL) ? pScrn->chipset : "Unknown ast"); - /* Resource Allocation */ + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - pAST->IODBase = pScrn->domainIOBase; -#else - pAST->IODBase = 0; -#endif /* "Patch" the PIOOffset inside vgaHW in order to force * the vgaHW module to use our relocated i/o ports. */ + VGAHWPTR(pScrn)->PIOOffset = + pScrn->domainIOBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380; + + pAST->RelocateIO = pScrn->domainIOBase + + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO); +#else + pAST->RelocateIO = (PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO)); -#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - VGAHWPTR(pScrn)->PIOOffset = /* ... */ #endif - pAST->PIOOffset = - pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380; - pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase); if (pAST->pEnt->device->MemBase != 0) { pAST->FBPhysAddr = pAST->pEnt->device->MemBase; ++++++ u_03-Fix-compiler-warnings-add-DrawablePtr-argument-to-ASTPutImage.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Tue Apr 22 12:37:49 2014 +0200 Subject: [PATCH 3/14]Fix compiler warnings: add DrawablePtr argument to ASTPutImage Patch-Mainline: to be upstreamed Git-commit: cf5db4696ac80c3cefce7acb38ba553863c1fc31 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <eich(a)suse.com> An archaeological survey revealed that this ABI change took place in 2006 already. Signed-off-by: Egbert Eich <eich(a)suse.de> --- src/ast_driver.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ast_driver.c b/src/ast_driver.c index 639562d..b04b026 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -128,7 +128,11 @@ static Bool ASTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode); static void ASTInitVideo(ScreenPtr pScreen); static int ASTPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, - int, unsigned char*, short, short, Bool, RegionPtr, pointer); + int, unsigned char*, short, short, Bool, RegionPtr, pointer +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 1 + , DrawablePtr pDraw +#endif + ); #endif /* @@ -2134,6 +2138,9 @@ static int ASTPutImage(ScrnInfoPtr pScrn, short width, short height, Bool sync, RegionPtr clipBoxes, pointer data +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 1 + , DrawablePtr pDraw +#endif ) { ASTPtr pAST = ASTPTR(pScrn); ++++++ u_04-Clean-up-namespace-in-ast_vgatools.c.patch ++++++ ++++ 971 lines (skipped) ++++++ u_05-Clean-up-namespace-in-ast_2dtool.c.patch ++++++ ++++ 628 lines (skipped) ++++++ u_06-Clean-up-namespace-in-ast_cursor.c.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Tue Apr 22 13:47:39 2014 +0200 Subject: [PATCH 6/14]Clean up namespace in ast_cursor.c Patch-Mainline: to be upstreamed Git-commit: 0d61630966ca6958d8e6fafe0575191a4634b9a4 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <eich(a)suse.com> - Make sure exported functions have 'AST' in their name. This avoids name space conflicts with the server or other drivers. - Place declaration of exported functions in a header file. This ensures that changes to the function type or arguments are followed thru everywhere. --- src/ast.h | 7 +++++++ src/ast_cursor.c | 5 +---- src/ast_driver.c | 3 --- src/ast_mode.c | 5 +---- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/ast.h b/src/ast.h index 20df2e1..707149e 100644 --- a/src/ast.h +++ b/src/ast.h @@ -335,6 +335,13 @@ UCHAR *pASTjRequestCMDQ(ASTRecPtr pAST, ULONG ulDataLen); Bool bASTEnable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST); void vASTDisable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST); +/* ast_cursor.c */ +#ifdef HWC +Bool ASTCursorInit(ScreenPtr pScreen); +Bool bASTInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST); +void ASTDisableHWC(ScrnInfoPtr pScrn); +#endif + /* Include Files */ #include "ast_mode.h" #include "ast_vgatool.h" diff --git a/src/ast_cursor.c b/src/ast_cursor.c index 7bfa15f..4598daa 100644 --- a/src/ast_cursor.c +++ b/src/ast_cursor.c @@ -53,9 +53,6 @@ #ifdef HWC /* Prototype type declaration */ -Bool ASTCursorInit(ScreenPtr pScreen); -Bool bInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST); -void ASTDisableHWC(ScrnInfoPtr pScrn); static void ASTShowCursor(ScrnInfoPtr pScrn); static void ASTHideCursor(ScrnInfoPtr pScrn); static void ASTSetCursorPosition(ScrnInfoPtr pScrn, int x, int y); @@ -111,7 +108,7 @@ ASTCursorInit(ScreenPtr pScreen) } -Bool bInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST) +Bool bASTInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST) { ScreenPtr pScreen; diff --git a/src/ast_driver.c b/src/ast_driver.c index 5b02c9e..4fc8b28 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -69,9 +69,6 @@ extern Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); extern Bool ASTAccelInit(ScreenPtr pScreen); #endif -extern Bool ASTCursorInit(ScreenPtr pScreen); -extern void ASTDisableHWC(ScrnInfoPtr pScrn); - /* Mandatory functions */ static void ASTIdentify(int flags); const OptionInfoRec *ASTAvailableOptions(int chipid, int busid); diff --git a/src/ast_mode.c b/src/ast_mode.c index 3d06700..9e41bd4 100644 --- a/src/ast_mode.c +++ b/src/ast_mode.c @@ -406,9 +406,6 @@ VBIOS_DAC_INFO DAC_VGA[] = { { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x00 }, }; -/* extern. function */ -extern Bool bInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST); - /* Prototype type declaration*/ Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); @@ -477,7 +474,7 @@ ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) #endif #ifdef HWC if (!pAST->noHWC) { - if (!bInitHWC(pScrn, pAST)) { + if (!bASTInitHWC(pScrn, pAST)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR,"Init HWC failed\n"); pAST->noHWC = TRUE; } ++++++ u_07-Clean-up-namespace-in-ast_mode.c.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Tue Apr 22 13:57:25 2014 +0200 Subject: [PATCH 7/14]Clean up namespace in ast_mode.c Patch-Mainline: to be upstreamed Git-commit: 441091fb94f5d0ef980a26c109af8ddedcd6c617 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <eich(a)suse.com> - Make local functions static This sometimes helps the compiler to optimize. - Made sure exported functions have 'AST' in their name. This avoids name space conflicts with the server or other drivers. - Placed declaration of exported functions in a header file. This ensures that changes to the function type or arguments are followed thru everywhere. Signed-off-by: Egbert Eich <eich(a)suse.de> --- src/ast.h | 3 ++ src/ast_driver.c | 2 -- src/ast_mode.c | 96 +++++++++++++++++++++++++++----------------------------- 3 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/ast.h b/src/ast.h index 707149e..89971d3 100644 --- a/src/ast.h +++ b/src/ast.h @@ -342,6 +342,9 @@ Bool bASTInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST); void ASTDisableHWC(ScrnInfoPtr pScrn); #endif +/* ast_mode.c */ +Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); + /* Include Files */ #include "ast_mode.h" #include "ast_vgatool.h" diff --git a/src/ast_driver.c b/src/ast_driver.c index 4fc8b28..8e3a814 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -63,8 +63,6 @@ extern Bool ASTUnmapMem(ScrnInfoPtr pScrn); extern Bool ASTMapMMIO(ScrnInfoPtr pScrn); extern void ASTUnmapMMIO(ScrnInfoPtr pScrn); -extern Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); - #ifdef HAVE_XAA_H extern Bool ASTAccelInit(ScreenPtr pScreen); #endif diff --git a/src/ast_mode.c b/src/ast_mode.c index 9e41bd4..ceb2ddb 100644 --- a/src/ast_mode.c +++ b/src/ast_mode.c @@ -53,7 +53,7 @@ /* Driver specific headers */ #include "ast.h" -VBIOS_STDTABLE_STRUCT StdTable[] = { +static VBIOS_STDTABLE_STRUCT StdTable[] = { /* MD_2_3_400 */ { 0x67, @@ -126,7 +126,7 @@ VBIOS_STDTABLE_STRUCT StdTable[] = { }, }; -VBIOS_ENHTABLE_STRUCT Res640x480Table[] = { +static VBIOS_ENHTABLE_STRUCT Res640x480Table[] = { { 800, 640, 8, 96, 525, 480, 2, 2, VCLK25_175, /* 60Hz */ (SyncNN | HBorder | VBorder | Charx8Dot), 60, 1, 0x2E }, { 832, 640, 16, 40, 520, 480, 1, 3, VCLK31_5, /* 72Hz */ @@ -140,7 +140,7 @@ VBIOS_ENHTABLE_STRUCT Res640x480Table[] = { }; -VBIOS_ENHTABLE_STRUCT Res800x600Table[] = { +static VBIOS_ENHTABLE_STRUCT Res800x600Table[] = { {1024, 800, 24, 72, 625, 600, 1, 2, VCLK36, /* 56Hz */ (SyncPP | Charx8Dot), 56, 1, 0x30 }, {1056, 800, 40, 128, 628, 600, 1, 4, VCLK40, /* 60Hz */ @@ -155,8 +155,7 @@ VBIOS_ENHTABLE_STRUCT Res800x600Table[] = { (SyncPP | Charx8Dot), 0xFF, 5, 0x30 }, }; - -VBIOS_ENHTABLE_STRUCT Res1024x768Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1024x768Table[] = { {1344, 1024, 24, 136, 806, 768, 3, 6, VCLK65, /* 60Hz */ (SyncNN | Charx8Dot), 60, 1, 0x31 }, {1328, 1024, 24, 136, 806, 768, 3, 6, VCLK75, /* 70Hz */ @@ -169,7 +168,7 @@ VBIOS_ENHTABLE_STRUCT Res1024x768Table[] = { (SyncPP | Charx8Dot), 0xFF, 4, 0x31 }, }; -VBIOS_ENHTABLE_STRUCT Res1280x1024Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1280x1024Table[] = { {1688, 1280, 48, 112, 1066, 1024, 1, 3, VCLK108, /* 60Hz */ (SyncPP | Charx8Dot), 60, 1, 0x32 }, {1688, 1280, 16, 144, 1066, 1024, 1, 3, VCLK135, /* 75Hz */ @@ -180,7 +179,7 @@ VBIOS_ENHTABLE_STRUCT Res1280x1024Table[] = { (SyncPP | Charx8Dot), 0xFF, 3, 0x32 }, }; -VBIOS_ENHTABLE_STRUCT Res1600x1200Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1600x1200Table[] = { {2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162, /* 60Hz */ (SyncPP | Charx8Dot), 60, 1, 0x33 }, {2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162, /* end */ @@ -188,21 +187,21 @@ VBIOS_ENHTABLE_STRUCT Res1600x1200Table[] = { }; /* 16:9 */ -VBIOS_ENHTABLE_STRUCT Res1360x768Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1360x768Table[] = { {1792, 1360, 64,112, 795, 768, 3, 6, VCLK85_5, /* 60Hz */ (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x39 }, {1792, 1360, 64,112, 795, 768, 3, 6, VCLK85_5, /* end */ (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x39 }, }; -VBIOS_ENHTABLE_STRUCT Res1600x900Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1600x900Table[] = { {1760, 1600, 48, 32, 926, 900, 3, 5, VCLK97_75, /* 60Hz CVT RB */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x3A }, {1760, 1600, 48, 32, 926, 900, 3, 5, VCLK97_75, /* end */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x3A }, }; -VBIOS_ENHTABLE_STRUCT Res1920x1080Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1920x1080Table[] = { {2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5, /* HDTV 60Hz */ (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x38 }, {2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5, /* end */ @@ -210,7 +209,7 @@ VBIOS_ENHTABLE_STRUCT Res1920x1080Table[] = { }; /* 16:10 */ -VBIOS_ENHTABLE_STRUCT Res1280x800Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1280x800Table[] = { {1440, 1280, 48, 32, 823, 800, 3, 6, VCLK71, /* 60Hz RB */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 35 }, {1680, 1280, 72,128, 831, 800, 3, 6, VCLK83_5, /* 60Hz */ @@ -220,7 +219,7 @@ VBIOS_ENHTABLE_STRUCT Res1280x800Table[] = { }; -VBIOS_ENHTABLE_STRUCT Res1440x900Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1440x900Table[] = { {1600, 1440, 48, 32, 926, 900, 3, 6, VCLK88_75, /* 60Hz RB */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x36 }, {1904, 1440, 80,152, 934, 900, 3, 6, VCLK106_5, /* 60Hz */ @@ -229,7 +228,7 @@ VBIOS_ENHTABLE_STRUCT Res1440x900Table[] = { (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x36 }, }; -VBIOS_ENHTABLE_STRUCT Res1680x1050Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1680x1050Table[] = { {1840, 1680, 48, 32, 1080, 1050, 3, 6, VCLK119, /* 60Hz RB */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x37 }, {2240, 1680,104,176, 1089, 1050, 3, 6, VCLK146_25, /* 60Hz */ @@ -238,14 +237,14 @@ VBIOS_ENHTABLE_STRUCT Res1680x1050Table[] = { (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x37 }, }; -VBIOS_ENHTABLE_STRUCT Res1920x1200Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1920x1200Table[] = { {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x34 }, {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x34 }, }; -VBIOS_DCLK_INFO DCLKTable [] = { +static VBIOS_DCLK_INFO DCLKTable [] = { {0x2C, 0xE7, 0x03}, /* 00: VCLK25_175 */ {0x95, 0x62, 0x03}, /* 01: VCLK28_322 */ {0x67, 0x63, 0x01}, /* 02: VCLK31_5 */ @@ -273,7 +272,7 @@ VBIOS_DCLK_INFO DCLKTable [] = { {0x32, 0x67, 0x80}, /* 18: VCLK85_5 */ }; -VBIOS_DCLK_INFO DCLKTable_AST2100 [] = { +static VBIOS_DCLK_INFO DCLKTable_AST2100 [] = { {0x2C, 0xE7, 0x03}, /* 00: VCLK25_175 */ {0x95, 0x62, 0x03}, /* 01: VCLK28_322 */ {0x67, 0x63, 0x01}, /* 02: VCLK31_5 */ @@ -301,7 +300,7 @@ VBIOS_DCLK_INFO DCLKTable_AST2100 [] = { {0x32, 0x67, 0x80}, /* 18: VCLK85_5 */ }; -VBIOS_DAC_INFO DAC_TEXT[] = { +static VBIOS_DAC_INFO DAC_TEXT[] = { { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x2a }, { 0x00, 0x2a, 0x00 }, { 0x00, 0x2a, 0x2a }, { 0x2a, 0x00, 0x00 }, { 0x2a, 0x00, 0x2a }, { 0x2a, 0x2a, 0x00 }, { 0x2a, 0x2a, 0x2a }, { 0x00, 0x00, 0x15 }, { 0x00, 0x00, 0x3f }, { 0x00, 0x2a, 0x15 }, { 0x00, 0x2a, 0x3f }, @@ -320,7 +319,7 @@ VBIOS_DAC_INFO DAC_TEXT[] = { { 0x3f, 0x15, 0x15 }, { 0x3f, 0x15, 0x3f }, { 0x3f, 0x3f, 0x15 }, { 0x3f, 0x3f, 0x3f }, }; -VBIOS_DAC_INFO DAC_EGA[] = { +static VBIOS_DAC_INFO DAC_EGA[] = { { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x2a }, { 0x00, 0x2a, 0x00 }, { 0x00, 0x2a, 0x2a }, { 0x2a, 0x00, 0x00 }, { 0x2a, 0x00, 0x2a }, { 0x2a, 0x2a, 0x00 }, { 0x2a, 0x2a, 0x2a }, { 0x00, 0x00, 0x15 }, { 0x00, 0x00, 0x3f }, { 0x00, 0x2a, 0x15 }, { 0x00, 0x2a, 0x3f }, @@ -339,7 +338,7 @@ VBIOS_DAC_INFO DAC_EGA[] = { { 0x3f, 0x15, 0x15 }, { 0x3f, 0x15, 0x3f }, { 0x3f, 0x3f, 0x15 }, { 0x3f, 0x3f, 0x3f }, }; -VBIOS_DAC_INFO DAC_VGA[] = { +static VBIOS_DAC_INFO DAC_VGA[] = { { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x2a }, { 0x00, 0x2a, 0x00 }, { 0x00, 0x2a, 0x2a }, { 0x2a, 0x00, 0x00 }, { 0x2a, 0x00, 0x2a }, { 0x2a, 0x15, 0x00 }, { 0x2a, 0x2a, 0x2a }, { 0x15, 0x15, 0x15 }, { 0x15, 0x15, 0x3f }, { 0x15, 0x3f, 0x15 }, { 0x15, 0x3f, 0x3f }, @@ -407,20 +406,19 @@ VBIOS_DAC_INFO DAC_VGA[] = { }; /* Prototype type declaration*/ -Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); -Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vSetStdReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vSetCRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vSetOffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vSetSyncReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -BOOL bSetAST1180CRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -BOOL bSetAST1180OffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -BOOL bSetAST1180DCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -BOOL bSetAST1180ExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vInitChontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vSetStdReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vSetCRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vSetOffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vSetSyncReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static BOOL bSetAST1180CRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static BOOL bSetAST1180OffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static BOOL bSetAST1180DCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static BOOL bSetAST1180ExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vInitChontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) @@ -485,7 +483,7 @@ ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) } -Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { ASTRecPtr pAST; ULONG ulModeID, ulColorIndex, ulRefreshRate, ulRefreshRateIndex = 0; @@ -628,7 +626,7 @@ Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_ return (TRUE); } -void vSetStdReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vSetStdReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_STDTABLE_STRUCT pStdModePtr; @@ -685,7 +683,7 @@ void vSetStdReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAMod } -void +static void vSetCRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { ASTRecPtr pAST; @@ -760,7 +758,7 @@ vSetCRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInf } -void vSetOffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vSetOffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { ASTRecPtr pAST; USHORT usOffset; @@ -774,7 +772,7 @@ void vSetOffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGA } -void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_ENHTABLE_STRUCT pEnhModePtr; PVBIOS_DCLK_INFO pDCLKPtr; @@ -795,7 +793,7 @@ void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAMo } -void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { ASTRecPtr pAST; @@ -853,7 +851,7 @@ void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAMod } -void vSetSyncReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vSetSyncReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_ENHTABLE_STRUCT pEnhModePtr; ASTRecPtr pAST; @@ -868,7 +866,7 @@ void vSetSyncReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAMo } -Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_DAC_INFO pDACPtr; ASTRecPtr pAST; @@ -902,7 +900,7 @@ Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAMod } -ULONG AST1180DCLKTable [] = { +static ULONG AST1180DCLKTable [] = { 0x0008676b, /* 00: VCLK25_175 */ 0x00086342, /* 01: VCLK28_322 */ 0x00086568, /* 02: VCLK31_5 */ @@ -926,7 +924,7 @@ ULONG AST1180DCLKTable [] = { 0x00040769, /* 14: VCLK148_5 */ }; -BOOL bSetAST1180CRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static BOOL bSetAST1180CRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { ASTRecPtr pAST = ASTPTR(pScrn); @@ -978,7 +976,7 @@ BOOL bSetAST1180CRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INF } /* bSetAST1180CRTCReg */ -BOOL bSetAST1180OffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static BOOL bSetAST1180OffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { ASTRecPtr pAST = ASTPTR(pScrn); ULONG ulOffset, ulTermalCount; @@ -993,7 +991,7 @@ BOOL bSetAST1180OffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_I } /* bSetAST1180OffsetReg */ -BOOL bSetAST1180DCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static BOOL bSetAST1180DCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_ENHTABLE_STRUCT pEnhModePtr; ASTRecPtr pAST = ASTPTR(pScrn); @@ -1008,7 +1006,7 @@ BOOL bSetAST1180DCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INF return (TRUE); } -BOOL bSetAST1180ExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static BOOL bSetAST1180ExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_ENHTABLE_STRUCT pEnhModePtr; ASTRecPtr pAST = ASTPTR(pScrn); @@ -1061,7 +1059,7 @@ BOOL bSetAST1180ExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO #define I2C_BASE_AST1180 0x80fcb000 #define I2C_DEVICEADDR_AST1180 0x0EC /* slave addr */ -void SetChrontelReg(ASTRecPtr pAST, UCHAR jChannel, UCHAR jIndex, UCHAR jData ) +static void SetChrontelReg(ASTRecPtr pAST, UCHAR jChannel, UCHAR jIndex, UCHAR jData ) { ULONG ulData, ulI2CAddr, ulI2CPortBase; ULONG retry; @@ -1117,7 +1115,7 @@ Exit_SetChrontelReg: ; } -UCHAR GetChrontelReg(ASTRecPtr pAST, UCHAR jChannel, UCHAR jIndex) +static UCHAR GetChrontelReg(ASTRecPtr pAST, UCHAR jChannel, UCHAR jIndex) { ULONG ulData, ulI2CAddr, ulI2CPortBase; UCHAR jData; @@ -1176,7 +1174,7 @@ UCHAR GetChrontelReg(ASTRecPtr pAST, UCHAR jChannel, UCHAR jIndex) return (jData); } -void vInitChontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vInitChontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_ENHTABLE_STRUCT pEnhModePtr = pVGAModeInfo->pEnhTableEntry; ++++++ u_08-Clean-up-namespace-in-ast_accel.c.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Tue Apr 22 14:05:17 2014 +0200 Subject: [PATCH 8/14]Clean up namespace in ast_accel.c Patch-Mainline: to be upstreamed Git-commit: 692756dca1427078e1f1b9f8b094aebb11ee11da Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <eich(a)suse.com> - Made sure exported functions have 'AST' in their name. This avoids name space conflicts with the server or other drivers. - Placed declaration of exported functions in a header file. This ensures that changes to the function type or arguments are followed thru everywhere. Signed-off-by: Egbert Eich <eich(a)suse.de> --- src/ast.h | 7 +++++++ src/ast_accel.c | 1 - src/ast_driver.c | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ast.h b/src/ast.h index 89971d3..a50f182 100644 --- a/src/ast.h +++ b/src/ast.h @@ -345,6 +345,13 @@ void ASTDisableHWC(ScrnInfoPtr pScrn); /* ast_mode.c */ Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); +/* ast_accel.c */ +#ifdef HAVE_XAA_H +Bool ASTAccelInit(ScreenPtr pScreen); +#endif +void ASTDisplayVideo(ScrnInfoPtr pScrn, ASTPortPrivPtr pPriv, RegionPtr clipBoxes, int id); + + /* Include Files */ #include "ast_mode.h" #include "ast_vgatool.h" diff --git a/src/ast_accel.c b/src/ast_accel.c index 6fd0ca9..1217b01 100644 --- a/src/ast_accel.c +++ b/src/ast_accel.c @@ -98,7 +98,6 @@ int ASTXAAPatternROP[16]= }; /* Prototype type declaration */ -Bool ASTAccelInit(ScreenPtr pScreen); static void ASTSync(ScrnInfoPtr pScrn); static void ASTSetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir, int ydir, int rop, diff --git a/src/ast_driver.c b/src/ast_driver.c index 8e3a814..3d3f01a 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -63,10 +63,6 @@ extern Bool ASTUnmapMem(ScrnInfoPtr pScrn); extern Bool ASTMapMMIO(ScrnInfoPtr pScrn); extern void ASTUnmapMMIO(ScrnInfoPtr pScrn); -#ifdef HAVE_XAA_H -extern Bool ASTAccelInit(ScreenPtr pScreen); -#endif - /* Mandatory functions */ static void ASTIdentify(int flags); const OptionInfoRec *ASTAvailableOptions(int chipid, int busid); @@ -2096,8 +2092,6 @@ static int ASTQueryImageAttributes(ScrnInfoPtr pScrn, int id, return size; } -extern void ASTDisplayVideo(ScrnInfoPtr pScrn, ASTPortPrivPtr pPriv, RegionPtr clipBoxes, int id); - static int ASTPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x, short drw_y, ++++++ u_09-Clean-up-namespace-in-ast_tool.c.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Tue Apr 22 14:09:10 2014 +0200 Subject: [PATCH 9/14]Clean up namespace in ast_tool.c Patch-Mainline: to be upstreamed Git-commit: 2532c8c4db1033ae9e15c760d21b963cdb5223e6 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <eich(a)suse.com> - Made sure exported functions have 'AST' in their name. This avoids name space conflicts with the server or other drivers. - Placed declaration of exported functions in a header file. This ensures that changes to the function type or arguments are followed thru everywhere. Signed-off-by: Egbert Eich <eich(a)suse.de> --- src/ast.h | 5 +++++ src/ast_driver.c | 6 ------ src/ast_tool.c | 6 ------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/ast.h b/src/ast.h index a50f182..953f257 100644 --- a/src/ast.h +++ b/src/ast.h @@ -351,6 +351,11 @@ Bool ASTAccelInit(ScreenPtr pScreen); #endif void ASTDisplayVideo(ScrnInfoPtr pScrn, ASTPortPrivPtr pPriv, RegionPtr clipBoxes, int id); +/* ast_tool.c */ +Bool ASTMapMem(ScrnInfoPtr pScrn); +Bool ASTUnmapMem(ScrnInfoPtr pScrn); +Bool ASTMapMMIO(ScrnInfoPtr pScrn); +void ASTUnmapMMIO(ScrnInfoPtr pScrn); /* Include Files */ #include "ast_mode.h" diff --git a/src/ast_driver.c b/src/ast_driver.c index 3d3f01a..863e590 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -57,12 +57,6 @@ /* Driver specific headers */ #include "ast.h" -/* external reference fucntion */ -extern Bool ASTMapMem(ScrnInfoPtr pScrn); -extern Bool ASTUnmapMem(ScrnInfoPtr pScrn); -extern Bool ASTMapMMIO(ScrnInfoPtr pScrn); -extern void ASTUnmapMMIO(ScrnInfoPtr pScrn); - /* Mandatory functions */ static void ASTIdentify(int flags); const OptionInfoRec *ASTAvailableOptions(int chipid, int busid); diff --git a/src/ast_tool.c b/src/ast_tool.c index 1e1cb6b..9ab28cb 100644 --- a/src/ast_tool.c +++ b/src/ast_tool.c @@ -50,12 +50,6 @@ /* Driver specific headers */ #include "ast.h" -/* Prototype type declaration*/ -Bool ASTMapMem(ScrnInfoPtr pScrn); -Bool ASTUnmapMem(ScrnInfoPtr pScrn); -Bool ASTMapMMIO(ScrnInfoPtr pScrn); -void ASTUnmapMMIO(ScrnInfoPtr pScrn); - Bool ASTMapMem(ScrnInfoPtr pScrn) { ++++++ u_10-Include-local-headers-only-when-needed.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Tue Apr 22 14:31:39 2014 +0200 Subject: [PATCH 10/14]Include local headers only when needed Patch-Mainline: to be upstreamed Git-commit: b56e27e8a6df32dfa42a5f5f2f8aafae3020441f Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <eich(a)suse.com> Move inclusion of local headers from ast.h to the individual files. Include only those headers which are needed. Signed-off-by: Egbert Eich <eich(a)suse.de> --- src/ast.h | 5 ----- src/ast_2dtool.c | 2 ++ src/ast_accel.c | 1 + src/ast_cursor.c | 2 ++ src/ast_driver.c | 3 +++ src/ast_mode.c | 2 ++ src/ast_vgatool.c | 1 + 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/ast.h b/src/ast.h index 953f257..6001b63 100644 --- a/src/ast.h +++ b/src/ast.h @@ -357,8 +357,3 @@ Bool ASTUnmapMem(ScrnInfoPtr pScrn); Bool ASTMapMMIO(ScrnInfoPtr pScrn); void ASTUnmapMMIO(ScrnInfoPtr pScrn); -/* Include Files */ -#include "ast_mode.h" -#include "ast_vgatool.h" -#include "ast_2dtool.h" -#include "ast_cursor.h" diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c index 3cf83fe..b4f0a4a 100644 --- a/src/ast_2dtool.c +++ b/src/ast_2dtool.c @@ -48,6 +48,8 @@ /* Driver specific headers */ #include "ast.h" +#include "ast_vgatool.h" +#include "ast_2dtool.h" #ifdef Accel_2D typedef Bool (*PFN_bENABLE_CMDQ)(ScrnInfoPtr , ASTRecPtr); diff --git a/src/ast_accel.c b/src/ast_accel.c index 1217b01..fd91688 100644 --- a/src/ast_accel.c +++ b/src/ast_accel.c @@ -52,6 +52,7 @@ /* Driver specific headers */ #include "ast.h" +#include "ast_2dtool.h" #ifdef Accel_2D diff --git a/src/ast_cursor.c b/src/ast_cursor.c index 4598daa..5031aac 100644 --- a/src/ast_cursor.c +++ b/src/ast_cursor.c @@ -50,6 +50,8 @@ /* Driver specific headers */ #include "ast.h" +#include "ast_vgatool.h" +#include "ast_cursor.h" #ifdef HWC /* Prototype type declaration */ diff --git a/src/ast_driver.c b/src/ast_driver.c index 863e590..b6accbf 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -56,6 +56,9 @@ /* Driver specific headers */ #include "ast.h" +#include "ast_mode.h" +#include "ast_vgatool.h" +#include "ast_2dtool.h" /* Mandatory functions */ static void ASTIdentify(int flags); diff --git a/src/ast_mode.c b/src/ast_mode.c index ceb2ddb..59488c4 100644 --- a/src/ast_mode.c +++ b/src/ast_mode.c @@ -52,6 +52,8 @@ /* Driver specific headers */ #include "ast.h" +#include "ast_mode.h" +#include "ast_vgatool.h" static VBIOS_STDTABLE_STRUCT StdTable[] = { /* MD_2_3_400 */ diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c index b42ac7a..9a96ac5 100644 --- a/src/ast_vgatool.c +++ b/src/ast_vgatool.c @@ -52,6 +52,7 @@ /* Driver specific headers */ #include "ast.h" +#include "ast_vgatool.h" __inline ULONG MIndwm(UCHAR *mmiobase, ULONG r) ++++++ u_11-Fix-typo.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Tue Apr 22 15:10:20 2014 +0200 Subject: [PATCH 11/14]Fix typo Patch-Mainline: to be upstreamed Git-commit: 53bc8e5819d946412059f1e22c50086b312e45d9 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <eich(a)suse.com> Chontel -> Chrontel Signed-off-by: Egbert Eich <eich(a)suse.de> --- src/ast_mode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ast_mode.c b/src/ast_mode.c index 59488c4..a52ee71 100644 --- a/src/ast_mode.c +++ b/src/ast_mode.c @@ -420,7 +420,7 @@ static BOOL bSetAST1180CRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_M static BOOL bSetAST1180OffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); static BOOL bSetAST1180DCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); static BOOL bSetAST1180ExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -static void vInitChontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vInitChrontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) @@ -443,7 +443,7 @@ ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) bSetAST1180DCLKReg(pScrn, mode, &vgamodeinfo); bSetAST1180ExtReg(pScrn, mode, &vgamodeinfo); - vInitChontelReg(pScrn, mode, &vgamodeinfo); + vInitChrontelReg(pScrn, mode, &vgamodeinfo); } else { @@ -1176,7 +1176,7 @@ static UCHAR GetChrontelReg(ASTRecPtr pAST, UCHAR jChannel, UCHAR jIndex) return (jData); } -static void vInitChontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vInitChrontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_ENHTABLE_STRUCT pEnhModePtr = pVGAModeInfo->pEnhTableEntry; ++++++ u_12-Fix-ABI-version-conflict-in-xf86UnclaimPciSlot.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Tue Apr 22 15:35:43 2014 +0200 Subject: [PATCH 12/14]Fix ABI version conflict in xf86UnclaimPciSlot() Patch-Mainline: to be upstreamed Git-commit: 553509b5ef5794d62a2b4d36c92794b17d8b01c6 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <eich(a)suse.com> xf86UnclaimPciSlot() received a GDevPtr as 2nd argument with ABI_VIDEODRV_VERSION 13. Signed-off-by: Egbert Eich <eich(a)suse.de> --- src/ast_driver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ast_driver.c b/src/ast_driver.c index b6accbf..be1ac0f 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -281,7 +281,11 @@ ASTProbe(DriverPtr drv, int flags) pPci->device_id, pPci->bus, pPci->domain, pPci->dev, pPci->func); xf86DrvMsg(0, X_ERROR, "ast: This driver cannot operate until it has been unloaded.\n"); - xf86UnclaimPciSlot(pPci, devSections[0]); + xf86UnclaimPciSlot(pPci +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 13 + , devSections[0] +#endif + ); free(devSections); return FALSE; } ++++++ u_13-Move-firmware-for-DP501-to-a-separate-file.patch ++++++ ++++ 6700 lines (skipped) ++++++ u_14-Add-_AST_H_-define-to-ast.h.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Tue Apr 22 17:09:42 2014 +0200 Subject: [PATCH 14/14]Add _AST_H_ define to ast.h Patch-Mainline: to be upstreamed Git-commit: b6bab2cb3330236efd835e14fee47156afcc063b Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <eich(a)suse.com> --- src/ast.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ast.h b/src/ast.h index 1bcb949..44239be 100644 --- a/src/ast.h +++ b/src/ast.h @@ -19,6 +19,10 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ + +#ifndef _AST_H_ +# define _AST_H_ + /* Compiler Options */ #define Accel_2D /* #define MMIO_2D */ @@ -356,3 +360,5 @@ Bool ASTMapMem(ScrnInfoPtr pScrn); Bool ASTUnmapMem(ScrnInfoPtr pScrn); Bool ASTMapMMIO(ScrnInfoPtr pScrn); void ASTUnmapMMIO(ScrnInfoPtr pScrn); + +#endif /* _AST_H_ */ ++++++ xf86-video-ast-0.98.0.tar.bz2 -> xf86-video-ast-0.99.9.tar.bz2 ++++++ ++++ 5785 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 virt-manager for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2014-04-26 06:06:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2014-04-13 13:20:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2014-04-26 06:06:28.000000000 +0200 @@ -1,0 +2,48 @@ +Tue Apr 22 09:31:58 MDT 2014 - carnold(a)suse.com + +- Upstream bug fix + 535584ed-fix-target-validation-when-editing-device.patch + +------------------------------------------------------------------- +Mon Apr 21 07:07:20 MDT 2014 - carnold(a)suse.com + +- bnc#874408 - virt-manager and libvirt issues persist - unable to + create or launch + virtman-vminstall.patch + +------------------------------------------------------------------- +Fri Apr 18 08:19:20 MDT 2014 - carnold(a)suse.com + +- Upstream bug fix + 5350d9cc-display-error-on-empty-installation-URL.patch + +------------------------------------------------------------------- +Thu Apr 17 19:49:59 MDT 2014 - carnold(a)suse.com + +- Dropped unused and unnecessary patches + virtinst-cdrom.patch + virtman-update-backend.patch + virtman-slow-mouse.patch + virtman-reverse-serialcon.patch +- Reordered some patches + +------------------------------------------------------------------- +Wed Apr 16 10:49:59 MDT 2014 - carnold(a)suse.com + +- Upstream bug fixes + 534bcfa0-use-uniformed-expression-of-Default.patch + 534be092-early-detect-ftp-connection-errors.patch + 534d45db-hiding-removebutton-for-USB-controller.patch + 534d6406-display-the-domain-for-PCI-devices.patch + 534eafe4-avoid-useless-errors-when-connection-closes.patch + +------------------------------------------------------------------- +Mon Apr 14 11:48:37 MDT 2014 - carnold(a)suse.com + +- bnc#872789 - XEN domain fails to start when xen disk is atttached + virtinst-xenbus-disk-index-fix.patch +- bnc#872777 - virt-manager - Error shutting down domain: internal + error: Failed to shutdown domain '3' with libxenlight + virtman-shutdown-with-acpi-button.patch + +------------------------------------------------------------------- @@ -10 +58 @@ -Wed Apr 8 11:06:41 MDT 2014 - carnold(a)suse.com +Tue Apr 8 11:06:41 MDT 2014 - carnold(a)suse.com @@ -19 +67 @@ -Wed Apr 3 19:25:41 MDT 2014 - carnold(a)suse.com +Thu Apr 3 19:25:41 MDT 2014 - carnold(a)suse.com @@ -52 +100 @@ -Fri Mar 31 13:47:38 MDT 2014 - carnold(a)suse.com +Mon Mar 31 13:47:38 MDT 2014 - carnold(a)suse.com @@ -75 +123 @@ -Wed Mar 27 18:54:21 MDT 2014 - carnold(a)suse.com +Thu Mar 27 18:54:21 MDT 2014 - carnold(a)suse.com @@ -81 +129 @@ -Wed Mar 27 08:28:21 MDT 2014 - carnold(a)suse.com +Thu Mar 27 08:28:21 MDT 2014 - carnold(a)suse.com @@ -95 +143 @@ -Wed Mar 24 13:58:36 MDT 2014 - carnold(a)suse.com +Tue Mar 24 13:58:36 MDT 2014 - carnold(a)suse.com @@ -173 +221 @@ -Tue Mar 13 08:19:52 MDT 2014 - carnold(a)suse.com +Thu Mar 13 08:19:52 MDT 2014 - carnold(a)suse.com @@ -200 +248 @@ -Fri Mar 10 07:46:16 MDT 2014 - carnold(a)suse.com +Mon Mar 10 07:46:16 MDT 2014 - carnold(a)suse.com @@ -235 +283 @@ -Wed Feb 27 08:00:39 MST 2014 - carnold(a)suse.com +Thu Feb 27 08:00:39 MST 2014 - carnold(a)suse.com @@ -257 +305 @@ -Thu Feb 14 15:45:58 MST 2014 - carnold(a)suse.com +Fri Feb 14 15:45:58 MST 2014 - carnold(a)suse.com Old: ---- virtinst-cdrom.patch virtman-reverse-serialcon.patch virtman-slow-mouse.patch virtman-update-backend.patch New: ---- 534bcfa0-use-uniformed-expression-of-Default.patch 534be092-early-detect-ftp-connection-errors.patch 534d45db-hiding-removebutton-for-USB-controller.patch 534d6406-display-the-domain-for-PCI-devices.patch 534eafe4-avoid-useless-errors-when-connection-closes.patch 5350d9cc-display-error-on-empty-installation-URL.patch 535584ed-fix-target-validation-when-editing-device.patch virtinst-xenbus-disk-index-fix.patch virtman-shutdown-with-acpi-button.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.BnHJcD/_old 2014-04-26 06:06:30.000000000 +0200 +++ /var/tmp/diff_new_pack.BnHJcD/_new 2014-04-26 06:06:30.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define with_guestfs 0 %define askpass_package "openssh-askpass" %define qemu_user "qemu" @@ -47,28 +46,32 @@ Patch9: 533d7602-fix-changing-graphics-type.patch Patch10: 533d7be7-clarify-iscsi-IQN-fields.patch Patch11: 5345682c-addstorage-remove-whitespace-for-storage-path.patch +Patch12: 534bcfa0-use-uniformed-expression-of-Default.patch +Patch13: 534be092-early-detect-ftp-connection-errors.patch +Patch14: 534d45db-hiding-removebutton-for-USB-controller.patch +Patch15: 534d6406-display-the-domain-for-PCI-devices.patch +Patch16: 534eafe4-avoid-useless-errors-when-connection-closes.patch +Patch17: 5350d9cc-display-error-on-empty-installation-URL.patch +Patch18: 535584ed-fix-target-validation-when-editing-device.patch Patch50: virtman-desktop.patch Patch51: virtman-cdrom.patch Patch52: virtman-kvm.patch Patch53: virtman-keycombo.patch -Patch60: virtman-device-flags.patch -Patch61: virtman-autorestart.patch -Patch62: virtman-eepro100.patch -Patch63: virtman-qed.patch -Patch64: virtman-update-backend.patch -Patch65: virtman-slow-mouse.patch -Patch66: virtman-reverse-serialcon.patch -Patch67: virtman-default-guest-from-host-os.patch -Patch68: virtman-default-to-xen-pv.patch -Patch69: virtman-autoyast-support.patch -Patch70: virtman-vminstall.patch -Patch71: virtman-show-suse-install-repos.patch -Patch72: virtman-packages.patch -Patch73: virtman-load-stored-uris.patch -Patch74: virtman-libvirtd-not-running.patch -Patch75: virtman-stable-os-support.patch -Patch76: virtman-add-s390x-arch-support.patch -Patch150: virtinst-cdrom.patch +Patch54: virtman-eepro100.patch +Patch55: virtman-qed.patch +Patch56: virtman-device-flags.patch +Patch57: virtman-autorestart.patch +Patch60: virtman-default-guest-from-host-os.patch +Patch61: virtman-default-to-xen-pv.patch +Patch62: virtman-autoyast-support.patch +Patch63: virtman-vminstall.patch +Patch64: virtman-show-suse-install-repos.patch +Patch65: virtman-packages.patch +Patch66: virtman-load-stored-uris.patch +Patch67: virtman-libvirtd-not-running.patch +Patch68: virtman-stable-os-support.patch +Patch69: virtman-add-s390x-arch-support.patch +Patch70: virtman-shutdown-with-acpi-button.patch Patch151: virtinst-storage-ocfs2.patch Patch152: virtinst-qed.patch Patch153: virtinst-support-suse-distros.patch @@ -79,6 +82,7 @@ Patch158: virtinst-set-qemu-emulator.patch Patch159: virtinst-vol-default-nocow.patch Patch160: virtinst-detect-windows-media.patch +Patch161: virtinst-xenbus-disk-index-fix.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -178,10 +182,21 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 %patch50 -p1 %patch51 -p1 %patch52 -p1 %patch53 -p1 +%patch54 -p1 +%patch55 -p1 +%patch56 -p1 +%patch57 -p1 %patch60 -p1 %patch61 -p1 %patch62 -p1 @@ -193,13 +208,6 @@ %patch68 -p1 %patch69 -p1 %patch70 -p1 -%patch71 -p1 -%patch72 -p1 -%patch73 -p1 -%patch74 -p1 -%patch75 -p1 -%patch76 -p1 -#%patch150 -p1 use 'c' for cdrom %patch151 -p1 %patch152 -p1 %patch153 -p1 @@ -210,6 +218,7 @@ %patch158 -p1 %patch159 -p1 %patch160 -p1 +%patch161 -p1 %build %if %{qemu_user} ++++++ 534bcfa0-use-uniformed-expression-of-Default.patch ++++++ Subject: details: use uniformed expression of "Default" From: Chen Hanxiao chenhanxiao(a)cn.fujitsu.com Mon Apr 14 20:08:00 2014 +0800 Date: Mon Apr 14 20:08:00 2014 +0800: Git: 4ccb1d862b5499b7488a0587735a1941aa1f1a07 We use both "Default" and "default" for controllers if no controller model needed. They should be the same expression and "Default" is a better choice. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Index: virt-manager-1.0.1/virtManager/details.py =================================================================== --- virt-manager-1.0.1.orig/virtManager/details.py +++ virt-manager-1.0.1/virtManager/details.py @@ -3048,7 +3048,7 @@ class vmmDetails(vmmGObjectUI): self.widget("config-remove").set_sensitive(True) uiutil.set_combo_entry(self.widget("controller-model"), - dev.model or "default") + dev.model or "Default") def refresh_filesystem_page(self): dev = self.get_hw_selection(HW_LIST_COL_DEVICE) ++++++ 534be092-early-detect-ftp-connection-errors.patch ++++++ Subject: virtinst: early detect ftp connection errors From: Giuseppe Scrivano gscrivan(a)redhat.com Mon Apr 14 14:49:21 2014 +0200 Date: Mon Apr 14 15:20:18 2014 +0200: Git: 1d312a520e92e89da1b4d958b9de0270eecc6b4b It fixes two problems: i) "ftp://" was accepted as valid URL but then it causes this exception: Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/usr/lib64/python2.7/ftplib.py", line 387, in login resp = self.sendcmd('USER ' + user) File "/usr/lib64/python2.7/ftplib.py", line 243, in sendcmd self.putcmd(cmd) File "/usr/lib64/python2.7/ftplib.py", line 178, in putcmd self.putline(line) File "/usr/lib64/python2.7/ftplib.py", line 173, in putline self.sock.sendall(line) AttributeError: 'NoneType' object has no attribute 'sendall' ii) only a cryptic error message "Unable to complete install: '[Errno -2] Name or service not known'" was showed to users when the DNS lookup failed. The exception is now intercepted and decorated with more information. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1086554 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py index 7075929..3f2744b 100644 --- a/virtinst/urlfetcher.py +++ b/virtinst/urlfetcher.py @@ -151,9 +151,16 @@ class _FTPImageFetcher(_URIImageFetcher): self.ftp = None def prepareLocation(self): - url = urlparse.urlparse(self._make_path("")) - self.ftp = ftplib.FTP(url[1]) - self.ftp.login() + try: + url = urlparse.urlparse(self._make_path("")) + if not url[1]: + raise ValueError(_("Invalid install location")) + self.ftp = ftplib.FTP(url[1]) + self.ftp.login() + except Exception, e: + raise ValueError(_("Opening URL %s failed: %s.") % + (self.location, str(e))) + def hasFile(self, filename): path = self._make_path(filename) ++++++ 534d45db-hiding-removebutton-for-USB-controller.patch ++++++ Subject: details: hiding removebutton for USB controller From: Chen Hanxiao chenhanxiao(a)cn.fujitsu.com Tue Apr 15 22:44:43 2014 +0800 Date: Tue Apr 15 22:44:43 2014 +0800: Git: 86fc54be8e1ab40dd3fc7533dd23fe4787f8c5c8 commit 4c53debd8a8e4c193e211cfa5128c9e88392c0a1 break hiding "config-remove" for USB controller. This patch will fix this issue. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Index: virt-manager-1.0.1/virtManager/details.py =================================================================== --- virt-manager-1.0.1.orig/virtManager/details.py +++ virt-manager-1.0.1/virtManager/details.py @@ -3041,7 +3041,7 @@ class vmmDetails(vmmGObjectUI): model.append(["ich9-ehci1", "USB 2"]) model.append(["nec-xhci", "USB 3"]) self.widget("config-remove").set_sensitive(False) - if dev.type == virtinst.VirtualController.TYPE_SCSI: + elif dev.type == virtinst.VirtualController.TYPE_SCSI: model.append(["default", "Default"]) model.append(["virtio-scsi", "VirtIO SCSI"]) else: ++++++ 534d6406-display-the-domain-for-PCI-devices.patch ++++++ Subject: virtinst: display the domain for PCI devices From: Giuseppe Scrivano gscrivan(a)redhat.com Tue Apr 15 16:22:33 2014 +0200 Date: Tue Apr 15 18:53:26 2014 +0200: Git: e980d9c737284a5e098a35ea6d8a17155aaf5ce9 Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1085499 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> diff --git a/virtinst/nodedev.py b/virtinst/nodedev.py index af6dbf7..17524dc 100644 --- a/virtinst/nodedev.py +++ b/virtinst/nodedev.py @@ -169,9 +169,10 @@ class PCIDevice(NodeDevice): iommu_group = XMLProperty("./capability/iommuGroup/@number", is_int=True) def pretty_name(self): - devstr = "%.2X:%.2X:%X" % (int(self.bus), - int(self.slot), - int(self.function)) + devstr = "%.4X:%.2X:%.2X:%X" % (int(self.domain), + int(self.bus), + int(self.slot), + int(self.function)) return "%s %s %s" % (devstr, self.vendor_name, self.product_name) ++++++ 534eafe4-avoid-useless-errors-when-connection-closes.patch ++++++ Subject: connection: Avoid some useless errors when connection closes From: Cole Robinson crobinso(a)redhat.com Wed Apr 16 12:23:57 2014 -0400 Date: Wed Apr 16 12:29:24 2014 -0400: Git: 873c22d19a23f1cc51845c82eb9dfe8b4d60b2d6 - Run the connection - Restart libvirtd, connection is auto closed - Re-run the connection - Manually stop it, see errors in the logs about unknown event IDs We need to unconditionally clear our event ID list Index: virt-manager-1.0.1/virtManager/connection.py =================================================================== --- virt-manager-1.0.1.orig/virtManager/connection.py +++ virt-manager-1.0.1/virtManager/connection.py @@ -970,14 +970,14 @@ class vmmConnection(vmmGObject): if not self._backend.is_closed(): for eid in self._domain_cb_ids: self._backend.domainEventDeregisterAny(eid) - self._domain_cb_ids = [] - for eid in self._network_cb_ids: self._backend.networkEventDeregisterAny(eid) - self._network_cb_ids = [] except: logging.debug("Failed to deregister events in conn cleanup", exc_info=True) + finally: + self._domain_cb_ids = [] + self._network_cb_ids = [] self._backend.close() self.record = [] ++++++ 5350d9cc-display-error-on-empty-installation-URL.patch ++++++ Subject: virt-manager: display error on an empty installation URL From: Giuseppe Scrivano gscrivan(a)redhat.com Thu Apr 17 12:00:09 2014 +0200 Date: Fri Apr 18 09:52:44 2014 +0200: Git: b20462d86101c17bee5abf6ef55ec633622054c2 Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1086529 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> Index: virt-manager-1.0.1/virtManager/create.py =================================================================== --- virt-manager-1.0.1.orig/virtManager/create.py +++ virt-manager-1.0.1/virtManager/create.py @@ -1308,7 +1308,8 @@ class vmmCreate(vmmGObjectUI): if self.have_startup_error: return - if curpage == PAGE_INSTALL and self.should_detect_media(): + if (curpage == PAGE_INSTALL and self.should_detect_media() + and self.get_config_detectable_media()): # Make sure we have detected the OS before validating the page self.detect_media_os(forward=True) return ++++++ 535584ed-fix-target-validation-when-editing-device.patch ++++++ Subject: filesystem: Fix target validation when editing device (bz 1089422) From: Cole Robinson crobinso(a)redhat.com Mon Apr 21 16:51:23 2014 -0400 Date: Mon Apr 21 16:51:57 2014 -0400: Git: e6a67fc7099ac39257108080c8cbcfcdc6371e56 diff --git a/virtinst/devicefilesystem.py b/virtinst/devicefilesystem.py index f516fed..28eda74 100644 --- a/virtinst/devicefilesystem.py +++ b/virtinst/devicefilesystem.py @@ -100,7 +100,8 @@ class VirtualFilesystem(VirtualDevice): # actually a directory, it is merely a arbitrary string tag # that is exported to the guest as a hint for where to mount if (self.conn.is_qemu() and - (self.type == self.TYPE_DEFAULT or + (self.type is None or + self.type == self.TYPE_DEFAULT or self.type == self.TYPE_MOUNT)): pass elif not os.path.isabs(val): ++++++ virtinst-detect-suse-distros.patch ++++++ --- /var/tmp/diff_new_pack.BnHJcD/_old 2014-04-26 06:06:30.000000000 +0200 +++ /var/tmp/diff_new_pack.BnHJcD/_new 2014-04-26 06:06:30.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- virt-manager-1.0.1.orig/virtinst/urlfetcher.py +++ virt-manager-1.0.1/virtinst/urlfetcher.py -@@ -296,6 +296,81 @@ def _distroFromTreeinfo(fetcher, arch, v +@@ -303,6 +303,81 @@ def _distroFromTreeinfo(fetcher, arch, v return ob @@ -84,7 +84,7 @@ def getDistroStore(guest, fetcher): stores = [] -@@ -312,6 +387,10 @@ def getDistroStore(guest, fetcher): +@@ -319,6 +394,10 @@ def getDistroStore(guest, fetcher): if dist: return dist @@ -95,7 +95,7 @@ # FIXME: This 'distro ==' doesn't cut it. 'distro' is from our os # dictionary, so would look like 'fedora9' or 'rhel5', so this needs # to be a bit more intelligent -@@ -808,12 +887,11 @@ class SLDistro(RHELDistro): +@@ -815,12 +894,11 @@ class SLDistro(RHELDistro): class SuseDistro(Distro): name = "SUSE" @@ -109,7 +109,7 @@ Distro.__init__(self, *args, **kwargs) if re.match(r'i[4-9]86', self.arch): self.arch = 'i386' -@@ -824,22 +902,44 @@ class SuseDistro(Distro): +@@ -831,22 +909,44 @@ class SuseDistro(Distro): oldkern += "64" oldinit += "64" @@ -164,7 +164,7 @@ return True def _get_method_arg(self): -@@ -860,6 +960,27 @@ class SuseDistro(Distro): +@@ -867,6 +967,27 @@ class SuseDistro(Distro): return name return self.os_variant ++++++ virtinst-detect-windows-media.patch ++++++ --- /var/tmp/diff_new_pack.BnHJcD/_old 2014-04-26 06:06:30.000000000 +0200 +++ /var/tmp/diff_new_pack.BnHJcD/_new 2014-04-26 06:06:30.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- virt-manager-1.0.1.orig/virtinst/urlfetcher.py +++ virt-manager-1.0.1/virtinst/urlfetcher.py -@@ -372,6 +372,24 @@ def _distroFromContent(fetcher, arch, vm +@@ -379,6 +379,24 @@ def _distroFromContent(fetcher, arch, vm return ob @@ -27,7 +27,7 @@ def getDistroStore(guest, fetcher): stores = [] logging.debug("Finding distro store for location=%s", fetcher.location) -@@ -391,6 +409,10 @@ def getDistroStore(guest, fetcher): +@@ -398,6 +416,10 @@ def getDistroStore(guest, fetcher): if dist: return dist @@ -38,7 +38,7 @@ # FIXME: This 'distro ==' doesn't cut it. 'distro' is from our os # dictionary, so would look like 'fedora9' or 'rhel5', so this needs # to be a bit more intelligent -@@ -1137,6 +1159,13 @@ class ALTLinuxDistro(Distro): +@@ -1144,6 +1166,13 @@ class ALTLinuxDistro(Distro): logging.debug("Regex didn't match, not a %s distro", self.name) return False @@ -67,7 +67,7 @@ -_add_var("win7", "Microsoft Windows 7 (or later)", supported=True, sortby="mswin7", parent="windows") +_add_var("win7", "Microsoft Windows 7", supported=True, sortby="mswin7", parent="windows") +_add_var("win8", "Microsoft Windows 8 (or later)", supported=True, sortby="mswin8", parent="windows") -+_add_var("win-unknown", "Unknown", supported=True, sortby="mswin", parent="windows") ++_add_var("win-unknown", "Microsoft Windows Unknown Version", supported=True, sortby="mswin", parent="windows") _add_type("solaris", "Solaris", clock="localtime") ++++++ virtinst-support-suse-distros.patch ++++++ --- /var/tmp/diff_new_pack.BnHJcD/_old 2014-04-26 06:06:30.000000000 +0200 +++ /var/tmp/diff_new_pack.BnHJcD/_new 2014-04-26 06:06:30.000000000 +0200 @@ -9,16 +9,16 @@ -_add_var("opensuse11", "openSuse 11", urldistro="suse", supported=True, virtiodisk=True, virtionet=True, parent="linux") -_add_var("opensuse12", "openSuse 12 (or later)", parent="opensuse11") +_add_var("opensuse11", "openSUSE 11", urldistro="opensuse", supported=True, virtiodisk=True, virtionet=True, parent="linux") -+_add_var("opensuse12", "openSUSE 12", parent="opensuse11") ++_add_var("opensuse12", "openSUSE 12", inputtype="tablet", inputbus="usb", parent="opensuse11") +_add_var("opensuse13", "openSUSE 13 (or later)", parent="opensuse12") + +_add_var("sles", "Suse Linux Enterprise Server", urldistro="suse", supported=True, parent="linux") +_add_var("sles10", "Suse Linux Enterprise Server 10", supported=True, virtiodisk=True, virtionet=True, parent="sles") -+_add_var("sles11", "Suse Linux Enterprise Server 11", supported=True, virtiodisk=True, virtionet=True, parent="sles10") ++_add_var("sles11", "Suse Linux Enterprise Server 11", supported=True, virtiodisk=True, virtionet=True, inputtype="tablet", inputbus="usb", parent="sles10") +_add_var("sles12", "Suse Linux Enterprise Server 12 (or later)", supported=True, virtiodisk=True, virtionet=True, parent="sles11") + +_add_var("sled10", "Suse Linux Enterprise Desktop 10", supported=True, virtiodisk=True, virtionet=True, parent="sles10") -+_add_var("sled11", "Suse Linux Enterprise Desktop 11", supported=True, virtiodisk=True, virtionet=True, parent="sles11") ++_add_var("sled11", "Suse Linux Enterprise Desktop 11", supported=True, virtiodisk=True, virtionet=True, inputtype="tablet", inputbus="usb", parent="sles11") +_add_var("sled12", "Suse Linux Enterprise Desktop 12 (or later)", supported=True, virtiodisk=True, virtionet=True, parent="sles12") -_add_var("sles10", "Suse Linux Enterprise Server", urldistro="suse", supported=True, parent="linux") ++++++ virtinst-xenbus-disk-index-fix.patch ++++++ bnc#872789 --- virt-manager-1.0.1/virtinst/devicedisk.py.orig 2014-04-14 11:41:36.904354483 -0600 +++ virt-manager-1.0.1/virtinst/devicedisk.py 2014-04-14 11:45:39.565744657 -0600 @@ -931,6 +931,15 @@ class VirtualDisk(VirtualDevice): @rtype C{str} """ prefix, maxnode = self.get_target_prefix(skip_targets) + postfix_targets = [] + if self.conn.is_xen(): + prefixes = [ "hd", "xvd", "vd", "sd", "fd" ] + for x in skip_targets: + for p in prefixes: + found = x.split(p,1) + if found and len(found) == 2: + postfix_targets.append(found[1]) + break skip_targets = [t for t in skip_targets if t and t.startswith(prefix)] skip_targets.sort() @@ -944,7 +953,12 @@ class VirtualDisk(VirtualDevice): ran = range(pref_ctrl * 7, (pref_ctrl + 1) * 7) for i in ran: - gen_t = prefix + self.num_to_target(i + 1) + postfix = self.num_to_target(i + 1) + gen_t = prefix + postfix + if self.conn.is_xen() and postfix in postfix_targets: + if gen_t in skip_targets: + skip_targets.remove(gen_t) + continue if gen_t in skip_targets: skip_targets.remove(gen_t) continue ++++++ virtman-autoyast-support.patch ++++++ --- /var/tmp/diff_new_pack.BnHJcD/_old 2014-04-26 06:06:30.000000000 +0200 +++ /var/tmp/diff_new_pack.BnHJcD/_new 2014-04-26 06:06:30.000000000 +0200 @@ -37,7 +37,7 @@ # Get previous type_row = self._selected_os_row() if not type_row: -@@ -1588,7 +1611,10 @@ class vmmCreate(vmmGObjectUI): +@@ -1589,7 +1612,10 @@ class vmmCreate(vmmGObjectUI): if extra: extraargs += extra if ks: @@ -49,7 +49,7 @@ if extraargs: self.guest.installer.extraargs = extraargs -@@ -1984,6 +2010,7 @@ class vmmCreate(vmmGObjectUI): +@@ -1985,6 +2011,7 @@ class vmmCreate(vmmGObjectUI): dl = self.set_os_val(self.widget("install-os-type"), distro_type) vl = self.set_os_val(self.widget("install-os-version"), distro_var) self.set_distro_labels(dl, vl) ++++++ virtman-device-flags.patch ++++++ --- /var/tmp/diff_new_pack.BnHJcD/_old 2014-04-26 06:06:30.000000000 +0200 +++ /var/tmp/diff_new_pack.BnHJcD/_new 2014-04-26 06:06:30.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- virt-manager-1.0.1.orig/virtManager/addhardware.py +++ virt-manager-1.0.1/virtManager/addhardware.py -@@ -1276,6 +1276,18 @@ class vmmAddHardware(vmmGObjectUI): +@@ -1280,6 +1280,18 @@ class vmmAddHardware(vmmGObjectUI): if controller is not None: logging.debug("Adding controller:\n%s", controller.get_xml_config()) ++++++ virtman-shutdown-with-acpi-button.patch ++++++ bnc#872777 Index: virt-manager-1.0.1/virtManager/domain.py =================================================================== --- virt-manager-1.0.1.orig/virtManager/domain.py +++ virt-manager-1.0.1/virtManager/domain.py @@ -1330,7 +1330,11 @@ class vmmDomain(vmmLibvirtObject): def shutdown(self): self._install_abort = True self._unregister_reboot_listener() - self._backend.shutdown() + try: + self._backend.shutdown() + except libvirt.libvirtError: + logging.debug("Initial shutdown failed. Attempting shutdown with acpi power button") + self._backend.shutdownFlags(libvirt.VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN) self.idle_add(self.force_update_status) def reboot(self): ++++++ virtman-vminstall.patch ++++++ --- /var/tmp/diff_new_pack.BnHJcD/_old 2014-04-26 06:06:30.000000000 +0200 +++ /var/tmp/diff_new_pack.BnHJcD/_new 2014-04-26 06:06:30.000000000 +0200 @@ -1,7 +1,7 @@ -Index: virt-manager-1.0.0/ui/manager.ui +Index: virt-manager-1.0.1/ui/manager.ui =================================================================== ---- virt-manager-1.0.0.orig/ui/manager.ui -+++ virt-manager-1.0.0/ui/manager.ui +--- virt-manager-1.0.1.orig/ui/manager.ui ++++ virt-manager-1.0.1/ui/manager.ui @@ -277,7 +277,7 @@ <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -19,10 +19,10 @@ </packing> </child> <child> -Index: virt-manager-1.0.0/virtManager/manager.py +Index: virt-manager-1.0.1/virtManager/manager.py =================================================================== ---- virt-manager-1.0.0.orig/virtManager/manager.py -+++ virt-manager-1.0.0/virtManager/manager.py +--- virt-manager-1.0.1.orig/virtManager/manager.py ++++ virt-manager-1.0.1/virtManager/manager.py @@ -95,6 +95,7 @@ class vmmManager(vmmGObjectUI): "action-show-host": (GObject.SignalFlags.RUN_FIRST, None, [str]), "action-show-preferences": (GObject.SignalFlags.RUN_FIRST, None, []), @@ -51,10 +51,10 @@ def show_about(self, src_ignore): self.emit("action-show-about") -Index: virt-manager-1.0.0/virtManager/vmmenu.py +Index: virt-manager-1.0.1/virtManager/vmmenu.py =================================================================== ---- virt-manager-1.0.0.orig/virtManager/vmmenu.py -+++ virt-manager-1.0.0/virtManager/vmmenu.py +--- virt-manager-1.0.1.orig/virtManager/vmmenu.py ++++ virt-manager-1.0.1/virtManager/vmmenu.py @@ -21,9 +21,28 @@ # pylint: disable=E0611 from gi.repository import Gtk @@ -84,10 +84,10 @@ # Build toolbar shutdown button menu (manager and details toolbar) # #################################################################### -Index: virt-manager-1.0.0/virtManager/config.py +Index: virt-manager-1.0.1/virtManager/config.py =================================================================== ---- virt-manager-1.0.0.orig/virtManager/config.py -+++ virt-manager-1.0.0/virtManager/config.py +--- virt-manager-1.0.1.orig/virtManager/config.py ++++ virt-manager-1.0.1/virtManager/config.py @@ -191,6 +191,13 @@ class vmmConfig(object): # General app wide helpers (gconf agnostic) @@ -102,10 +102,10 @@ def get_appname(self): return self.appname def get_appversion(self): -Index: virt-manager-1.0.0/virtManager/engine.py +Index: virt-manager-1.0.1/virtManager/engine.py =================================================================== ---- virt-manager-1.0.0.orig/virtManager/engine.py -+++ virt-manager-1.0.0/virtManager/engine.py +--- virt-manager-1.0.1.orig/virtManager/engine.py ++++ virt-manager-1.0.1/virtManager/engine.py @@ -25,9 +25,12 @@ from gi.repository import Gtk # pylint: enable=E0611 @@ -152,7 +152,7 @@ + + def _do_show_create(self, src, uri, use_vminstall=False): + if uri is None: -+ uri = default_uri() ++ uri = vmmConnect.default_uri(always_system=True) + conn = self._lookup_conn(uri) + do_remote = conn.is_remote() + if self.windowCreate == None or do_remote != self.remote_install: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0