Hello community, here is the log from the commit of package simple-scan for openSUSE:Factory checked in at Wed Aug 3 17:36:44 CEST 2011.
-------- --- simple-scan/simple-scan.changes 2011-05-04 10:10:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/simple-scan/simple-scan.changes 2011-08-03 12:49:45.000000000 +0200 @@ -1,0 +2,30 @@ +Wed Aug 3 12:43:20 CEST 2011 - [email protected] + +- Remove unneeded pkgconfig(gconf-2.0) BuildRequires. +- Add pkgconfig(cairo) and pkgconfig(gdk-pixbuf-2.0) BuildRequires, + which were implicit before. + +------------------------------------------------------------------- +Fri Jul 15 03:42:16 UTC 2011 - [email protected] + +- Update to version 3.1.3: + + Port to Vala + + Port to GTK+ 3 + + Port to GDBus + + Port to GSettings + + Port to colord +- Move to pkgconfig()-style BuildRequires, as well as move to + GTK+ 3 technologies at the same time: + + Old ones: glib2-devel, gtk2-devel, gconf2-devel, + libgudev-1_0-devel. + + New ones: gconf-2.0, gtk+-3.0, gudev-1.0. +- Add pkgconfig(colord) BuildRequires, for new dependency. +- Add fdupes BuildRequires and call %fdupes in %install. +- Remove support for openSUSE 11.3 and earlier, as GTK+ 3 is + required anyway. +- Removed --disable-static from %configure as it is not existing. +- Add simple-scan-gpointer.patch: fix assignment in the threading + code of gboolean to gpointer variables. +- Use %glib2_gsettings_schema_* macros. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- simple-scan-2.32.0.2.tar.bz2 New: ---- simple-scan-3.1.3.tar.bz2 simple-scan-gpointer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simple-scan.spec ++++++ --- /var/tmp/diff_new_pack.vldcDH/_old 2011-08-03 17:35:36.000000000 +0200 +++ /var/tmp/diff_new_pack.vldcDH/_new 2011-08-03 17:35:36.000000000 +0200 @@ -18,32 +18,33 @@ Name: simple-scan -Version: 2.32.0.2 +Version: 3.1.3 Release: 1 License: GPLv3+ Summary: Simple Scanning Utility Url: https://launchpad.net/simple-scan Group: System/GUI/GNOME Source0: %{name}-%{version}.tar.bz2 -BuildRequires: glib2-devel -BuildRequires: gtk2-devel -BuildRequires: gconf2-devel +# PATCH-FIX-UPSTREAM simple-scan-gpointer.patch lp#811286 [email protected] -- Fix gboolean to gpointer conversion. +Patch0: simple-scan-gpointer.patch +BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-icon-theme BuildRequires: intltool -BuildRequires: libgudev-1_0-devel BuildRequires: libjpeg-devel -%if 0%{?suse_version} > 1130 BuildRequires: sane-backends-devel -%else -BuildRequires: sane-backends -%endif BuildRequires: update-desktop-files +BuildRequires: vala +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(colord) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(zlib) Requires: xdg-utils Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description Simple Scan is an easy-to-use application, designed to let users connect @@ -57,9 +58,10 @@ %lang_package %prep %setup -q +%patch0 -p1 %build -%configure --disable-static +%configure %__make %{?jobs:-j%jobs} %install @@ -78,32 +80,22 @@ sed -i "s/\(Icon.*=\)scanner/\1simple-scan/g" %{buildroot}%{_datadir}/applications/%{name}.desktop %suse_update_desktop_file %{name} %find_lang %{name} %{?no_lang_C} -%find_gconf_schemas +%fdupes %{buildroot}%{_datadir} %clean %{__rm} -rf %{buildroot} -%pre -f %{name}.schemas_pre - -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun - -%if 0%{?suse_version} > 1130 - %post +%glib2_gsettings_schema_post %desktop_database_post %icon_theme_cache_post -%endif - -%if 0%{?suse_version} > 1130 %postun +%glib2_gsettings_schema_postun %desktop_database_postun %icon_theme_cache_postun -%endif -%files -f %{name}.schemas_list +%files %defattr(-, root, root) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_datadir}/gnome/ @@ -112,6 +104,7 @@ %doc %{_datadir}/gnome/help/%{name}/C/ %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop +%{_datadir}/glib-2.0/schemas/org.gnome.SimpleScan.gschema.xml %{_datadir}/icons/hicolor/*/apps/simple-scan.* %{_datadir}/%{name}/ %{_mandir}/man1/%{name}.1* ++++++ simple-scan-2.32.0.2.tar.bz2 -> simple-scan-3.1.3.tar.bz2 ++++++ ++++ 40577 lines of diff (skipped) ++++++ simple-scan-gpointer.patch ++++++ diff -ur simple-scan-3.1.3/src/scanner.vala simple-scan-3.1.3.patched/src/scanner.vala --- simple-scan-3.1.3/src/scanner.vala 2011-06-12 12:16:48.000000000 +0200 +++ simple-scan-3.1.3.patched/src/scanner.vala 2011-07-15 23:22:17.970638863 +0200 @@ -193,7 +193,7 @@ private static Scanner scanner_object = null; /* Thread communicating with SANE */ - private unowned Thread<bool> thread; + private unowned Thread<void*> thread; /* Queue of requests from main thread */ private AsyncQueue<Request> request_queue; @@ -1318,7 +1318,7 @@ } } - private bool scan_thread () + private void* scan_thread () { state = ScanState.IDLE; @@ -1328,7 +1328,7 @@ if (status != Sane.Status.GOOD) { warning ("Unable to initialize SANE backend: %s", Sane.strstatus(status)); - return false; + return null; } debug ("SANE version %d.%d.%d", Sane.VERSION_MAJOR(version_code), @@ -1370,14 +1370,14 @@ } } - return true; + return null; } public void start () { try { - thread = Thread.create<bool> (scan_thread, true); + thread = Thread.create<void*> (scan_thread, true); } catch (Error e) { Only in simple-scan-3.1.3.patched/src: .scanner.vala.swp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
