Hello community, here is the log from the commit of package midori for openSUSE:Factory checked in at 2014-05-14 10:26:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/midori (Old) and /work/SRC/openSUSE:Factory/.midori.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "midori" Changes: -------- --- /work/SRC/openSUSE:Factory/midori/midori.changes 2013-08-19 10:51:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.midori.new/midori.changes 2014-05-14 10:26:01.000000000 +0200 @@ -1,0 +2,185 @@ +Thu May 8 10:44:03 UTC 2014 - [email protected] + +- Split off a libmidori-core subpackage. +- Install some header files to the -devel subpackage. +- Add baselibs.conf as a source. +- Use %cmake and %cmake_install macros. +- BuldReqires appdata-tools for openSUSE >= 13.2. +- Install a manual page (taken from the Debian project). +- Clean up the spec. + +------------------------------------------------------------------- +Fri May 2 18:32:33 UTC 2014 - [email protected] + +- update to version 0.5.8 + - Use png icon instead of svg in set_status + - We must not pass a Cancellable to FaviconDatabase.get_favicon_pixbuf + - Retain spelling suggestion menu items from WebKit + - Properly guard usage of gtk3 get_style_context + - Mimic the look of Granite.DynamicNotebook when compiled with –enable-granite. + - Fix X11 lib underlink in midori-core + - Fix bookmarkbar bookmark click not opening links + - Use sanitized app URI as wm_classname/ StartupWMClass + - Make trunk build with WebKit2 again + - Fix for incorrect tstamp for background tabs + - Don't declare sorting doubles are nullable and print values when database tracing is enabled + - Correctly apply saved entry state and treat urlbar as a regular editable item + - Add missing conditional includes for granite flavoured build + - Open URIs dragged on tab label or new tab button + - Small adblock bugfixes + - Work around GTK3's hard-coded minimum stackswitcher button width + - Fix building with mingw packages from fedora 18 + - Set page title as basis for print filename + - Rename notes inline + - Use EXTRA_WARNINGS option when building for windows + - Drop forgotten clutter init and obsolete header declarations + - Rework history-step handling and make it work again + - Port Tabby to DatabaseStatement API + - Replace bookmark stracing with generic profiling in Midori.Database + - Port autocompleter test to async job + - Finishing touches for Adblock + - Add filters and defaults + - Implement and use ContextAction.escaped + - printf URI in show_message_dialog for download error + - Improve docs and GIR annotations for KatzeItem, KatzeArray, and MidoriWebSettings + - Drop redundant TabNew from compact menu and put button in Tab Panel + - Fix loading file pages + - Implement Send Page Link by Email + - Use GtkStackSwitcher with GTK+ >= 3.10 + - Implements context popup menu on menu entries of bookmark bar and bookmark menu. + - Fix building with newer mingw versions + - Display locationbar suggestions in the correct order + - Don't bother adblocking internal pages and favicons + - Don't use trailing comma on last list element in Adblock tests + - Rewrite Adblock more modularly, add Whitelist support + - Add support of DragonFlyBSD + - Change tooltips of Reload and ReloadStop actions while shift modifier is pressed + - Implement Midori.Database.attach method + - Allow :memory: as folder to make schema detection work + - More robust app/ profile creation + - Add helper callbacks to modify bookmark's tree store with unneded access to bookmarks db + - Implement more flexible fallback behavior for Cookie Permissions + +- changes from version 0.5.7 + - Modify actions and internal items in browser without changing settings + - Delay tab loading after Midori crashed + - Uncomment failing assertions about view_source in tab test + - Fallback to about:home if startup is anything but blank + - Don't try to create formhistory database if config_dir is NULL + - Handle url arguments for blank sessions + - Execute commands given at start time + - Introduce high-level prepare/ DatabaseStatement API + - Drop unused GraniteClutter-based animation support + - Drop uncommented contractor support + - Drop deprecated StaticNotebook used in KatzePreferences + - Introduce notebook class converging separate implementations + - Work around symbol relocation issue old version of gcc present on Ubuntu LTS + - NULL-check treeview in midori_search_action_get_editor + - Adjust CMakeList .ico check to not skip nojs icons + - Enable sidepanel in private mode + - Move Preferences menu entry above About + - Set minimum value of 0 on spin button for maximum cache size + - Give NextForward its own label for toolbar editor + - Correctly disable favicon database in app and private mode + - Change preferences to refer to proxy address as a “URI” (not “hostname”) + - Add close tabs to right feature + - Allow printing without confirmation dialog on kiosk setups + +- changes from version 0.5.6 + - instead of creating devpet status icon on extension load, create it only to show new messages + - Open speed dial or homepage according to preference + - handle tab duplication + - Add copyright note to appdata file + - Tweak searching for resources when running from build folder + - Swap NULL-check with main frame check + - Use correct signal when clearing the trash + - Hide WebGL preference if it is unavailable + - Remove stored popup sessions from the database + - Check all browsers for opened sessions and whether they're popups + - removed unused preference dialog and related code + - Fix check for found valac and mention VALAC variable + - Fix autoscrolling if page contains a frame with our custom error page + - Don't use context-menu signal in WebKitGTK+ < 1.10.0 + - Fix building on Ubuntu 12.04 + - Reset item ids when re-importing bookmarks + - Check path being NULL in export before trying to inspect it + - restore the last closed sessions if no session is opened + - Cast WebKitDOMHtmlElement for getting source content + - Use font-set signal and font family for GTK+ 3.2 font chooser + - add function to view dom source + - remove unused variable + - Resolve compiler warnings in current trunk + - Update win32-release script for cmake, move unused docs/scripts to old folder + - Try to handle previous runs of cmake in configure wrapper + - Correct view source assertions in tab unit test + - Build fix: found undeclared in midori_bookmarks_db_remove_item_recursive + - Cache bookmark items to avoid their recreation on database reads + - allow “view source” on about pages + - Enable old target policy on cmake < 2.8.8 + - Re-arrange data file installing to be more explicit + - option to modify the number of tabs which will be restored in each idle callback + - Implement MidoriBookmarksDatabase class by inheritence from MidoriDatabase + - Ensure tab spinners update as often as the menubar spinner to avoid desync + - Use tabby sorting increment when importing session.xbel tabs + - Only install config files to /etc if prefix equals /usr + - handle urls as argument when starting midori + - Make tabby compile with Webkit2 + - Drop waf build system and provide cmake-based “configure” script + - midori_panel_action_activate_cb forgot to update the action group + - Fixes bug where certificate Security overlay failed to close + - handle tab movement + - add tab sorting + - Untangle implicit GTK+3 for Granite and WebKit2 + - Allow running test under debug tools with cmake + - Install config files to /etc when install prefix is /usr + - Add missing PO_FILES argument to GETTEXT_PROCESS_PO_FILES + - Add USE_APIDOCS to build API docs with CMake + - Rasterize SVG to PNG with rsvg-convert + - fix bookmarks test regression after fix-1179200-4 + - Add CMakeLists.txt for config directory + - Install mo files in locale dir + - don't change uri/title if the tab isn't loaded + - use a separate signal to store the tab title + - Check if execinfo.h header exists on BSD + - fix endless loop in Midori.Database.init + - Use destructive-action style class in ClearPrivateData + - Initialize priv→element to avoid crash when freeing + - Introduces KatzeArray::update-item to handle metadata changes + - Refactor excuting schema from file into a function + - Use stock as string in liststore + - Drop needless (and wrong) HAVE_LIBNOTIFY in preferences + - Flip horizontal position of the overlay when hit by the mouse + - Add Midori.URI.get_base_domain and use it in NoJS + - Introduce Midori.Database and use for history and tabby + - ctrl+shift+w should trigger a delete-event + - Implement dialog windows opened via javascript + - Make get_res_filename work with different hierarchies + - fix check for new database + - Speed up session import + - Import tab title from old sessions + - Separate CFLAGS for C and add missing HAVE_ + - Install top-level text files and FAQ html/ css to doc dir + - Provide and install .appdata.xml file for app stores + - Move bookmarks db handling to midori-bookmarks-db + - Add XSS to OPTS_LIBRARIES + - Update condition for UBUNTU_MENUPROXY to work on Saucy + - Introduce tabby, the new session manager + - Fix typo in katze_item_set_meta_integer call + - Allow bookmark bar update on additions resulting from imports + - Re-work midori_array_query_recursive to not include folder items twice + - Fix syntax of icon sizes passed to foreach + - Add bzr revision number to version if available + - Unify nojs and cookie policy dialogs, make policy changeable within the list + - Drop all G_ENABLE_DEBUG guards + - Add -g to CFLAGS to enable debugging symbols + - Adjust cmake build for Win32 + - Implement CMake build setup + - Port MidoriApp from Unique/ sockets to GApplication + - New signal about-content to provide content for about uris + - Check if browser is NULL in midori_view_get_tab_menu to prevent a crash. Fixes bug #1215652. + - Ensure proxy setting widgets callbacks don't outlive the widgets themselves + - Fix webkit2 build error + - Show the bookmarks import location combobox. + - Rename internal completion URLs to avoid confusion + +------------------------------------------------------------------- Old: ---- midori-0.5.5.tar.bz2 New: ---- baselibs.conf midori-0.5.8.tar.bz2 midori.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ midori.spec ++++++ --- /var/tmp/diff_new_pack.63zhqO/_old 2014-05-14 10:26:02.000000000 +0200 +++ /var/tmp/diff_new_pack.63zhqO/_new 2014-05-14 10:26:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package midori # -# 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 @@ -16,40 +16,47 @@ # +%define major 1 Name: midori -Version: 0.5.5 +Version: 0.5.8 Release: 0 Summary: Lightweight Webkit-based Web Browser -License: LGPL-2.1 +License: LGPL-2.1+ Group: Productivity/Networking/Web/Browsers Url: http://midori-browser.org/ -Source: https://launchpad.net/midori/trunk/%{version}/+download/%{name}-%{version}.tar.bz2 +Source0: https://launchpad.net/midori/trunk/%{version}/+download/%{name}-%{version}.tar.bz2 +Source1: %{name}.1 +Source99: baselibs.conf +%if 0%{?suse_version} >= 1320 +BuildRequires: appdata-tools +%endif +BuildRequires: cmake BuildRequires: docutils -BuildRequires: gtk-doc +BuildRequires: fdupes BuildRequires: intltool -BuildRequires: python # for rsvg-convert utility BuildRequires: rsvg-view BuildRequires: update-desktop-files -# for valac -BuildRequires: vala >= 0.14 BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk-doc) BuildRequires: pkgconfig(javascriptcoregtk-1.0) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(unique-1.0) -BuildRequires: pkgconfig(webkit-1.0) >= 1.8.3 +# for valac +BuildRequires: pkgconfig(vapigen) +BuildRequires: pkgconfig(webkit-1.0) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xscrnsaver) -BuildRequires: pkgconfig(zeitgeist-1.0) >= 0.3.14 +BuildRequires: pkgconfig(zeitgeist-1.0) Requires: %{name}-branding = %{version} -Recommends: %{name}-lang = %{version} +Recommends: %{name}-lang Recommends: ca-certificates Recommends: xdg-utils Provides: browser(npapi) @@ -66,10 +73,18 @@ * Customizable and extensible interface. * Extensions written in C and Vala. +%package -n libmidori-core%{major} +Summary: Midori Library +Group: System/Libraries + +%description -n libmidori-core%{major} +Midori shared library. + %package devel Summary: Development Files for Midori Group: Development/Libraries/C and C++ -Recommends: vala >= 0.14 +Requires: libmidori-core%{major} = %{version} +Recommends: pkgconfig(vapigen) %description devel This package contains development files needed to develop extensions for @@ -80,10 +95,10 @@ Group: Productivity/Networking/Web/Browsers # BRAND: config: Controls default browser settings such as the homepage. # BRAND: search: Controls the default search engines. -Conflicts: otherproviders(%{name}-branding) -Provides: %{name}-branding = %{version} Supplements: packageand(%{name}:branding-upstream) +Provides: %{name}-branding = %{version} BuildArch: noarch +Conflicts: otherproviders(%{name}-branding) %description branding-upstream This package provides the upstream look and feel for the Midori web browser. @@ -91,7 +106,7 @@ %lang_package %prep -%setup -q +%setup -q -c # remove parts that do not conform to the desktop file spec for desktop in data/midori.desktop.in data/midori-private.desktop.in; do awk ' @@ -111,46 +126,43 @@ done %build -export CFLAGS="%{optflags}" -# --debug-level=debug is the default an partially overrides CFLAGS -# by specifiying --docdir the HTML help is found in the right location -./waf configure \ - --nocache \ - --enable-apidocs \ - --debug-level=none \ - --prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir} \ - --localstatedir=%{_localstatedir} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --docdir=%{_defaultdocdir}/%{name} -./waf build -v --nocache %{?_smp_mflags} +%cmake \ + -DUSE_APIDOCS=ON +make %{?_smp_mflags} VERBOSE=1 %install -./waf install --nocache --destdir=%{buildroot} +%cmake_install + +# Install a manual page. +install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/%{name}.1 + +# Install some header files. +install -d -m 0755 %{buildroot}%{_includedir}/%{name}-0.5/extensions/ +install -p -m 0644 build/midori/midori-core.h \ + %{buildroot}%{_includedir}/%{name}-0.5/ +install -p -m 0644 build/extensions/*.h \ + %{buildroot}%{_includedir}/midori-0.5/extensions/ # documentation files are included below -rm -rf %{buildroot}%{_defaultdocdir}/%{name} +rm -rf %{buildroot}%{_datadir}/doc/%{name}/ + +%fdupes -s %{buildroot}%{_datadir}/ # upstream does not provide a default configuration file -cat >%{buildroot}%{_sysconfdir}/xdg/midori/config <<EOF +cat >%{buildroot}%{_sysconfdir}/xdg/%{name}/config <<EOF [settings] EOF -# API doc needs to be installed manually -install -d -m 755 %{buildroot}%{_datadir}/gtk-doc/html/%{name} -install -p -m 644 _build/docs/api/midori/html/* \ - %{buildroot}%{_datadir}/gtk-doc/html/%{name} - -%suse_update_desktop_file -i %{name} -%suse_update_desktop_file -i %{name}-private - -rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK,no} +%suse_update_desktop_file %{name} +%suse_update_desktop_file %{name}-private %find_lang %{name} %{?no_lang_C} -%clean -rm -rf %{buildroot} +%check +pushd build +# TODO: +#xvfb-run make check +popd %post %desktop_database_post @@ -160,40 +172,44 @@ %desktop_database_postun %icon_theme_cache_postun +%post -n libmidori-core%{major} -p /sbin/ldconfig + +%postun -n libmidori-core%{major} -p /sbin/ldconfig + %files -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog EXPAT README HACKING TODO TRANSLATE -%doc data/faq.css data/faq.html +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING EXPAT README %{_bindir}/%{name} -%dir %{_libdir}/midori -%{_libdir}/midori/*.so -%dir %{_sysconfdir}/xdg/midori -%dir %{_sysconfdir}/xdg/midori/extensions -%dir %{_sysconfdir}/xdg/midori/extensions/adblock -%config(noreplace) %{_sysconfdir}/xdg/midori/extensions/adblock/config %{_datadir}/%{name}/ +%if 0%{?suse_version} && 0%{?suse_version} < 1320 +%dir %{_datadir}/appdata/ +%endif +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}-private.desktop %{_datadir}/icons/hicolor/*/*/* +%{_libdir}/%{name}/ +%doc %{_mandir}/man?/* +%dir %{_sysconfdir}/xdg/%{name}/ +%dir %{_sysconfdir}/xdg/%{name}/extensions/ +%dir %{_sysconfdir}/xdg/%{name}/extensions/adblock/ +%config(noreplace) %{_sysconfdir}/xdg/%{name}/extensions/adblock/config + +%files -n libmidori-core%{major} +%defattr(-,root,root,-) +%{_libdir}/libmidori-core.so.* %files devel -%defattr(-,root,root) -%doc %{_datadir}/gtk-doc/html/%{name} -%{_includedir}/midori-0.5 -%dir %{_datadir}/vala -%dir %{_datadir}/vala/vapi -%{_datadir}/vala/vapi/apps.* -%{_datadir}/vala/vapi/transfers.* -%{_datadir}/vala/vapi/history-list.* -%{_datadir}/vala/vapi/external-download-manager.* -%{_datadir}/vala/vapi/delayed-load.* -%{_datadir}/vala/vapi/nsplugin-manager.* -%{_datadir}/vala/vapi/devpet.* +%defattr(-,root,root,-) +%doc HACKING TODO TRANSLATE +%doc %{_datadir}/gtk-doc/html/%{name}-0-5/ +%{_includedir}/midori-0.5/ +%{_libdir}/libmidori-core.so %files branding-upstream -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/xdg/midori/search -%config(noreplace) %{_sysconfdir}/xdg/midori/config +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/xdg/%{name}/config +%config(noreplace) %{_sysconfdir}/xdg/%{name}/search %files lang -f %{name}.lang ++++++ baselibs.conf ++++++ libmidori-core1 ++++++ midori-0.5.5.tar.bz2 -> midori-0.5.8.tar.bz2 ++++++ ++++ 571793 lines of diff (skipped) ++++++ midori-0.5.5.tar.bz2 -> midori.1 ++++++ Files /work/SRC/openSUSE:Factory/midori/midori-0.5.5.tar.bz2 and /work/SRC/openSUSE:Factory/.midori.new/midori.1 differ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
