openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
January 2018
- 1 participants
- 2007 discussions
Hello community,
here is the log from the commit of package chromium for openSUSE:Factory checked in at 2018-01-30 15:43:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Tue Jan 30 15:43:06 2018 rev:176 rq:570606 version:64.0.3282.119
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2018-01-28 20:32:58.016168886 +0100
+++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2018-01-30 15:43:08.582136086 +0100
@@ -1,0 +2,10 @@
+Mon Jan 29 13:07:38 UTC 2018 - tchvatal(a)suse.com
+
+- Fix default page to not point to 404
+
+-------------------------------------------------------------------
+Mon Jan 29 12:36:31 UTC 2018 - tchvatal(a)suse.com
+
+- Install swiftshader objects too as they are needed
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.6tIbUx/_old 2018-01-30 15:43:20.561576825 +0100
+++ /var/tmp/diff_new_pack.6tIbUx/_new 2018-01-30 15:43:20.565576638 +0100
@@ -583,9 +583,7 @@
%install
mkdir -p %{buildroot}%{_libdir}/chromium
-%ifarch x86_64
mkdir -p %{buildroot}%{_libexecdir}/
-%endif
mkdir -p %{buildroot}%{_bindir}
install -m 755 %{SOURCE100} %{buildroot}%{_bindir}/chromium
@@ -608,6 +606,9 @@
cp -a icudtl.dat %{buildroot}%{_libdir}/chromium/
%endif
+mkdir -p %{buildroot}%{_libdir}/chromium/swiftshader
+cp -a swiftshader/*.so %{buildroot}%{_libdir}/chromium/swiftshader/
+
# chromedriver
cp -a chromedriver %{buildroot}%{_libdir}/chromium/
@@ -668,6 +669,8 @@
%dir %{_datadir}/gnome-control-center
%dir %{_datadir}/gnome-control-center/default-apps
%{_libdir}/chromium/
+%dir %{_libdir}/chromium/swiftshader/
+%{_libdir}/chromium/swiftshader/*.so
%{_datadir}/applications/*.desktop
%dir %{_datadir}/appdata/
%{_datadir}/appdata/chromium-browser.appdata.xml
++++++ master_preferences ++++++
--- /var/tmp/diff_new_pack.6tIbUx/_old 2018-01-30 15:43:20.729568982 +0100
+++ /var/tmp/diff_new_pack.6tIbUx/_new 2018-01-30 15:43:20.729568982 +0100
@@ -23,7 +23,7 @@
},
"first_run_tabs": [
"https://www.opensuse.org/searchPage/",
- "http://tools.google.com/chrome/intl/en/welcome.html"
+ "https://www.google.com/chrome/browser/welcome.html"
],
"homepage": "https://www.opensuse.org/searchPage/",
"homepage_is_newtabpage": false
1
0
Hello community,
here is the log from the commit of package gap-digraphs for openSUSE:Factory checked in at 2018-01-30 15:43:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gap-digraphs (Old)
and /work/SRC/openSUSE:Factory/.gap-digraphs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gap-digraphs"
Tue Jan 30 15:43:04 2018 rev:4 rq:570570 version:0.11.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gap-digraphs/gap-digraphs.changes 2018-01-28 20:33:43.926024368 +0100
+++ /work/SRC/openSUSE:Factory/.gap-digraphs.new/gap-digraphs.changes 2018-01-30 15:43:05.278290326 +0100
@@ -1,0 +2,14 @@
+Fri Jan 26 19:47:36 UTC 2018 - stefan.bruens(a)rwth-aachen.de
+
+- Remove all transient build artifacts (e.g. config.log) to make
+ build reproducible
+- delete remaining sources and test assets
+
+-------------------------------------------------------------------
+Fri Jan 26 18:15:27 UTC 2018 - stefan.bruens(a)rwth-aachen.de
+
+- Add 0001-Drop-bad-include-of-x86intrin.h.patch
+ Remove unnecessary include of x86intrin.h, breaks compilation on
+ anything but x86.
+
+-------------------------------------------------------------------
New:
----
0001-Drop-bad-include-of-x86intrin.h.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gap-digraphs.spec ++++++
--- /var/tmp/diff_new_pack.0o4fY5/_old 2018-01-30 15:43:05.874262503 +0100
+++ /var/tmp/diff_new_pack.0o4fY5/_new 2018-01-30 15:43:05.878262316 +0100
@@ -26,7 +26,7 @@
Source: https://www.gap-system.org/pub/gap/gap4/tar.bz2/packages/digraphs-%version.…
Patch1: digraphs-no-native.diff
-# Source contains a modified copy of bliss-0.73, so we cannot reuse bliss-devel
+Patch2: 0001-Drop-bad-include-of-x86intrin.h.patch
BuildRequires: automake
BuildRequires: fdupes
BuildRequires: gap-devel
@@ -42,7 +42,8 @@
Suggests: gap-gapdoc >= 1.5.1
Suggests: gap-grape >= 4.5
Suggests: gap-nautytracesinterface >= 0.2
-ExclusiveArch: %ix86 x86_64
+# Source contains a modified copy of bliss-0.73, so we cannot reuse bliss-devel
+Provides: bundled(bliss) = 0.73
%description
The Digraphs package is a GAP package containing methods for digraphs
@@ -50,7 +51,7 @@
%prep
%setup -qn digraphs-%version
-%patch -P 1 -p1
+%patch -P 1 -P 2 -p1
%build
autoreconf -fi
@@ -60,7 +61,11 @@
%install
find . -type f -name .dirstamp -print -delete
-rm -Rf autom4te.cache src m4 tst
+# delete tests and assets
+rm -Rf tst data/symmetric-closure.ds6.gz data/test-1.d6
+# delete sources and build artifacts, user is not expected to rebuild in distribution tree
+rm -Rf autom4te.cache src cnf config* m4 autogen.sh aclocal.m4 *.la Makefile*
+
%gappkg_simple_install
%fdupes %buildroot/%_prefix
find %buildroot
++++++ 0001-Drop-bad-include-of-x86intrin.h.patch ++++++
>From 0ffdc3c3455a485768467a3f755ccaaa13f4f9b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens(a)rwth-aachen.de>
Date: Fri, 26 Jan 2018 19:14:51 +0100
Subject: [PATCH] Drop bad include of x86intrin.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Trying to include it does break compilation on anything but x86, and even
on x86 it is completely unnecessary, as builtins are "just there".
Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de>
---
src/homos.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/homos.h b/src/homos.h
index cdac4d1..e370fc8 100644
--- a/src/homos.h
+++ b/src/homos.h
@@ -15,7 +15,6 @@
#include <config.h>
#include <limits.h>
#include <setjmp.h>
-#include <x86intrin.h>
#include "bliss-0.73/bliss_C.h"
#include "src/schreier-sims.h"
--
2.16.1
1
0
Hello community,
here is the log from the commit of package gstreamer-plugins-libav for openSUSE:Factory checked in at 2018-01-30 15:43:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-libav (Old)
and /work/SRC/openSUSE:Factory/.gstreamer-plugins-libav.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-plugins-libav"
Tue Jan 30 15:43:01 2018 rev:7 rq:570559 version:1.12.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/gstreamer-plugins-libav/gstreamer-plugins-libav.changes 2017-12-20 10:40:18.145084662 +0100
+++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-libav.new/gstreamer-plugins-libav.changes 2018-01-30 15:43:01.774453903 +0100
@@ -1,0 +2,7 @@
+Fri Jan 26 17:09:48 UTC 2018 - bjorn.lie(a)gmail.com
+
+- Add conditional libavcodec.so(unrestricted) Requires, pull in the
+ full codecpack when installing package from third party repos who
+ build libavcodec.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-plugins-libav.spec ++++++
--- /var/tmp/diff_new_pack.V9qAxN/_old 2018-01-30 15:43:02.386425333 +0100
+++ /var/tmp/diff_new_pack.V9qAxN/_new 2018-01-30 15:43:02.386425333 +0100
@@ -45,6 +45,9 @@
Requires: gstreamer >= %{version}
Enhances: gstreamer
Supplements: packageand(%{name}:gstreamer)
+%if 0%{?BUILD_ORIG}
+Requires: %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libavcodec.so))(unrestricted)
+%endif
%description
GStreamer is a streaming media framework, based on graphs of filters which
1
0
Hello community,
here is the log from the commit of package digikam for openSUSE:Factory checked in at 2018-01-30 15:42:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/digikam (Old)
and /work/SRC/openSUSE:Factory/.digikam.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam"
Tue Jan 30 15:42:54 2018 rev:167 rq:570509 version:5.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2018-01-19 11:54:16.244647811 +0100
+++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2018-01-30 15:42:56.186714767 +0100
@@ -1,0 +2,9 @@
+Thu Jan 18 23:17:51 UTC 2018 - nico.kruber(a)gmail.com
+
+- Add digikam-5.8.0.fix-db-migration-0001.patch (adapted to 5.8.0),
+ digikam-5.8.0.fix-db-migration-0002.patch,
+ digikam-5.8.0.fix-db-migration-0003.patch, and
+ digikam-5.8.0.fix-db-migration-0004.patch to fix MySQL DB
+ migration issues (kde#388824, kde#388867, kde#388977)
+
+-------------------------------------------------------------------
New:
----
digikam-5.8.0.fix-db-migration-0001.patch
digikam-5.8.0.fix-db-migration-0002.patch
digikam-5.8.0.fix-db-migration-0003.patch
digikam-5.8.0.fix-db-migration-0004.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ digikam.spec ++++++
--- /var/tmp/diff_new_pack.3AnAdP/_old 2018-01-30 15:43:00.006536439 +0100
+++ /var/tmp/diff_new_pack.3AnAdP/_new 2018-01-30 15:43:00.006536439 +0100
@@ -34,6 +34,14 @@
Patch3: fix-italian-docs-with-older-kdoctools.patch
# PATCH-FIX-UPSTREAM
Patch4: fix-font-size-in-tooltips.patch
+# PATCH-FIX-UPSTREAM digikam-5.8.0.fix-db-migration-0001.patch -- fix MySQL DB migration issues (kde#388824, kde#388867, kde#388977)
+Patch5: digikam-5.8.0.fix-db-migration-0001.patch
+# PATCH-FIX-UPSTREAM
+Patch6: digikam-5.8.0.fix-db-migration-0002.patch
+# PATCH-FIX-UPSTREAM
+Patch7: digikam-5.8.0.fix-db-migration-0003.patch
+# PATCH-FIX-UPSTREAM
+Patch8: digikam-5.8.0.fix-db-migration-0004.patch
#This pulls in QWebEngine, which is not available on ppc64
%ifarch %ix86 x86_64 %arm aarch64 mips mips64
BuildRequires: akonadi-contact-devel
@@ -185,6 +193,14 @@
%endif
%patch4 -p1
+# DB migration fixes
+cd core
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+cd ..
+
# Remove build time references so build-compare can do its work
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
++++++ digikam-5.8.0.fix-db-migration-0001.patch ++++++
>From 5893fde69518d70904d2b96e13800c7432b4e4c4 Mon Sep 17 00:00:00 2001
From: Maik Qualmann <metzpinguin(a)gmail.com>
Date: Mon, 15 Jan 2018 20:24:41 +0100
Subject: fix schema update from V7/8 to V9 with temporary tables BUGS: 388977
BUGS: 388867 BUGS: 388824 FIXED-IN: 5.9.0
---
data/database/dbconfig.xml.cmake.in | 154 +++++++++++++++++++++++++++++-------
2 files changed, 124 insertions(+), 30 deletions(-)
diff --git a/data/database/dbconfig.xml.cmake.in b/data/database/dbconfig.xml.cmake.in
index a315361..2c5008f 100644
--- a/data/database/dbconfig.xml.cmake.in
+++ b/data/database/dbconfig.xml.cmake.in
@@ -1992,8 +1992,6 @@
END IF;
END;
</statement>
- <statement mode="plain">SET SESSION OLD_ALTER_TABLE=1;</statement>
- <statement mode="plain">SET SESSION FOREIGN_KEY_CHECKS=0;</statement>
<statement mode="plain">DROP TRIGGER IF EXISTS delete_image;</statement>
<statement mode="plain">DROP TRIGGER IF EXISTS delete_tag;</statement>
<statement mode="plain">DROP TRIGGER IF EXISTS move_tagstree;</statement>
@@ -2064,85 +2062,181 @@
<statement mode="plain">ALTER TABLE TagProperties MODIFY COLUMN value LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci;</statement>
<statement mode="plain">ALTER TABLE ImageTagProperties MODIFY COLUMN property TEXT CHARACTER SET utf8 COLLATE utf8_general_ci;</statement>
<statement mode="plain">ALTER TABLE ImageTagProperties MODIFY COLUMN value LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci;</statement>
- <statement mode="plain">ALTER IGNORE TABLE AlbumRoots
+
+ <statement mode="plain">RENAME TABLE AlbumRoots TO AlbumRoots_old;</statement>
+ <statement mode="plain">CREATE TABLE AlbumRoots LIKE AlbumRoots_old;</statement>
+ <statement mode="plain">ALTER TABLE AlbumRoots
ADD UNIQUE (identifier(127), specificPath(128)),
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE Albums
+ <statement mode="plain">INSERT IGNORE INTO AlbumRoots SELECT * FROM AlbumRoots_old;</statement>
+
+ <statement mode="plain">RENAME TABLE Albums TO Albums_old;</statement>
+ <statement mode="plain">CREATE TABLE Albums LIKE Albums_old;</statement>
+ <statement mode="plain">ALTER TABLE Albums
ADD CONSTRAINT Albums_AlbumRoots FOREIGN KEY (albumRoot) REFERENCES AlbumRoots (id) ON DELETE CASCADE ON UPDATE CASCADE,
ADD UNIQUE (albumRoot, relativePath(255)),
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE Images
+ <statement mode="plain">INSERT IGNORE INTO Albums SELECT * FROM Albums_old;</statement>
+ <statement mode="plain">UPDATE Albums SET icon = NULL WHERE icon = 0;</statement>
+
+ <statement mode="plain">RENAME TABLE Images TO Images_old;</statement>
+ <statement mode="plain">CREATE TABLE Images LIKE Images_old;</statement>
+ <statement mode="plain">ALTER TABLE Images
ADD CONSTRAINT Images_Albums FOREIGN KEY (album) REFERENCES Albums (id) ON DELETE CASCADE ON UPDATE CASCADE,
ADD UNIQUE (album, name(255)),
ENGINE InnoDB;</statement>
- <statement mode="plain">UPDATE Albums SET icon = NULL WHERE icon = 0;</statement>
- <statement mode="plain">ALTER IGNORE TABLE Albums
+ <statement mode="plain">INSERT IGNORE INTO Images SELECT * FROM Images_old;</statement>
+
+ <statement mode="plain">ALTER TABLE Albums
ADD CONSTRAINT Albums_Images FOREIGN KEY (icon) REFERENCES Images (id) ON DELETE SET NULL ON UPDATE CASCADE;</statement>
- <statement mode="plain">ALTER IGNORE TABLE ImageHaarMatrix
+
+ <statement mode="plain">RENAME TABLE ImageHaarMatrix TO ImageHaarMatrix_old;</statement>
+ <statement mode="plain">CREATE TABLE ImageHaarMatrix LIKE ImageHaarMatrix_old;</statement>
+ <statement mode="plain">ALTER TABLE ImageHaarMatrix
ADD CONSTRAINT ImageHaarMatrix_Images FOREIGN KEY (imageid) REFERENCES Images (id) ON DELETE CASCADE ON UPDATE CASCADE,
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE ImageInformation
+ <statement mode="plain">INSERT IGNORE INTO ImageHaarMatrix SELECT * FROM ImageHaarMatrix_old;</statement>
+
+ <statement mode="plain">RENAME TABLE ImageInformation TO ImageInformation_old;</statement>
+ <statement mode="plain">CREATE TABLE ImageInformation LIKE ImageInformation_old;</statement>
+ <statement mode="plain">ALTER TABLE ImageInformation
ADD CONSTRAINT ImageInformation_Images FOREIGN KEY (imageid) REFERENCES Images (id) ON DELETE CASCADE ON UPDATE CASCADE,
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE ImageMetadata
+ <statement mode="plain">INSERT IGNORE INTO ImageInformation SELECT * FROM ImageInformation_old;</statement>
+
+ <statement mode="plain">RENAME TABLE ImageMetadata TO ImageMetadata_old;</statement>
+ <statement mode="plain">CREATE TABLE ImageMetadata LIKE ImageMetadata_old;</statement>
+ <statement mode="plain">ALTER TABLE ImageMetadata
ADD CONSTRAINT ImageMetadata_Images FOREIGN KEY (imageid) REFERENCES Images (id) ON DELETE CASCADE ON UPDATE CASCADE,
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE VideoMetadata
+ <statement mode="plain">INSERT IGNORE INTO ImageMetadata SELECT * FROM ImageMetadata_old;</statement>
+
+ <statement mode="plain">RENAME TABLE VideoMetadata TO VideoMetadata_old;</statement>
+ <statement mode="plain">CREATE TABLE VideoMetadata LIKE VideoMetadata_old;</statement>
+ <statement mode="plain">ALTER TABLE VideoMetadata
ADD CONSTRAINT VideoMetadata_Images FOREIGN KEY (imageid) REFERENCES Images (id) ON DELETE CASCADE ON UPDATE CASCADE,
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE ImagePositions
+ <statement mode="plain">INSERT IGNORE INTO VideoMetadata SELECT * FROM VideoMetadata_old;</statement>
+
+ <statement mode="plain">RENAME TABLE ImagePositions TO ImagePositions_old;</statement>
+ <statement mode="plain">CREATE TABLE ImagePositions LIKE ImagePositions_old;</statement>
+ <statement mode="plain">ALTER TABLE ImagePositions
ADD CONSTRAINT ImagePositions_Images FOREIGN KEY (imageid) REFERENCES Images (id) ON DELETE CASCADE ON UPDATE CASCADE,
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE ImageComments
+ <statement mode="plain">INSERT IGNORE INTO ImagePositions SELECT * FROM ImagePositions_old;</statement>
+
+ <statement mode="plain">RENAME TABLE ImageComments TO ImageComments_old;</statement>
+ <statement mode="plain">CREATE TABLE ImageComments LIKE ImageComments_old;</statement>
+ <statement mode="plain">ALTER TABLE ImageComments
ADD CONSTRAINT ImageComments_Images FOREIGN KEY (imageid) REFERENCES Images (id) ON DELETE CASCADE ON UPDATE CASCADE,
ADD UNIQUE(imageid, type, language, author(202)),
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE ImageCopyright
+ <statement mode="plain">INSERT IGNORE INTO ImageComments SELECT * FROM ImageComments_old;</statement>
+
+ <statement mode="plain">RENAME TABLE ImageCopyright TO ImageCopyright_old;</statement>
+ <statement mode="plain">CREATE TABLE ImageCopyright LIKE ImageCopyright_old;</statement>
+ <statement mode="plain">ALTER TABLE ImageCopyright
ADD CONSTRAINT ImageCopyright_Images FOREIGN KEY (imageid) REFERENCES Images (id) ON DELETE CASCADE ON UPDATE CASCADE,
ADD UNIQUE(imageid, property(110), value(111), extraValue(111)),
ENGINE InnoDB;</statement>
+ <statement mode="plain">INSERT IGNORE INTO ImageCopyright SELECT * FROM ImageCopyright_old;</statement>
+
+ <statement mode="plain">RENAME TABLE Tags TO Tags_old;</statement>
+ <statement mode="plain">CREATE TABLE Tags LIKE Tags_old;</statement>
+ <statement mode="plain">ALTER TABLE Tags
+ ADD CONSTRAINT Tags_Images FOREIGN KEY (icon) REFERENCES Images (id) ON DELETE SET NULL ON UPDATE CASCADE,
+ ADD UNIQUE(pid, name(100)),
+ ENGINE InnoDB;</statement>
+ <statement mode="plain">INSERT IGNORE INTO Tags SELECT * FROM Tags_old;</statement>
<statement mode="plain">SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO';</statement>
<statement mode="plain">REPLACE INTO Tags (id, pid, name, icon, iconkde, lft, rgt) VALUES (0, -1, '_Digikam_root_tag_', NULL, NULL,
(SELECT MIN(tl.lft) FROM Tags AS tl),
(SELECT MAX(tr.rgt) FROM Tags AS tr));</statement>
<statement mode="plain">SET SQL_MODE=@OLD_SQL_MODE;</statement>
- <statement mode="plain">UPDATE Tags set icon = NULL WHERE icon = 0;</statement>
- <statement mode="plain">ALTER IGNORE TABLE Tags
- ADD CONSTRAINT Tags_Images FOREIGN KEY (icon) REFERENCES Images (id) ON DELETE SET NULL ON UPDATE CASCADE,
- ADD UNIQUE(pid, name(100)),
- ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE ImageTags
+ <statement mode="plain">UPDATE Tags SET icon = NULL WHERE icon = 0;</statement>
+
+ <statement mode="plain">RENAME TABLE ImageTags TO ImageTags_old;</statement>
+ <statement mode="plain">CREATE TABLE ImageTags LIKE ImageTags_old;</statement>
+ <statement mode="plain">ALTER TABLE ImageTags
ADD CONSTRAINT ImageTags_Images FOREIGN KEY (imageid) REFERENCES Images (id) ON DELETE CASCADE ON UPDATE CASCADE,
ADD CONSTRAINT ImageTags_Tags FOREIGN KEY (tagid) REFERENCES Tags (id) ON DELETE CASCADE ON UPDATE CASCADE,
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE ImageProperties
+ <statement mode="plain">INSERT IGNORE INTO ImageTags SELECT * FROM ImageTags_old;</statement>
+
+ <statement mode="plain">RENAME TABLE ImageProperties TO ImageProperties_old;</statement>
+ <statement mode="plain">CREATE TABLE ImageProperties LIKE ImageProperties_old;</statement>
+ <statement mode="plain">ALTER TABLE ImageProperties
ADD CONSTRAINT ImageProperties_Images FOREIGN KEY (imageid) REFERENCES Images (id) ON DELETE CASCADE ON UPDATE CASCADE,
ADD UNIQUE (imageid, property(255)),
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE Searches
+ <statement mode="plain">INSERT IGNORE INTO ImageProperties SELECT * FROM ImageProperties_old;</statement>
+
+ <statement mode="plain">ALTER TABLE Searches
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE DownloadHistory
+
+ <statement mode="plain">RENAME TABLE DownloadHistory TO DownloadHistory_old;</statement>
+ <statement mode="plain">CREATE TABLE DownloadHistory LIKE DownloadHistory_old;</statement>
+ <statement mode="plain">ALTER TABLE DownloadHistory
ADD UNIQUE(identifier(164), filename(165), filesize, filedate),
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE Settings
+ <statement mode="plain">INSERT IGNORE INTO DownloadHistory SELECT * FROM DownloadHistory_old;</statement>
+
+ <statement mode="plain">RENAME TABLE Settings TO Settings_old;</statement>
+ <statement mode="plain">CREATE TABLE Settings LIKE Settings_old;</statement>
+ <statement mode="plain">ALTER TABLE Settings
ADD UNIQUE(keyword(255)),
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE ImageHistory
+ <statement mode="plain">INSERT IGNORE INTO Settings SELECT * FROM Settings_old;</statement>
+
+ <statement mode="plain">RENAME TABLE ImageHistory TO ImageHistory_old;</statement>
+ <statement mode="plain">CREATE TABLE ImageHistory LIKE ImageHistory_old;</statement>
+ <statement mode="plain">ALTER TABLE ImageHistory
ADD CONSTRAINT ImageHistory_Images FOREIGN KEY (imageid) REFERENCES Images (id) ON DELETE CASCADE ON UPDATE CASCADE,
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE ImageRelations
+ <statement mode="plain">INSERT IGNORE INTO ImageHistory SELECT * FROM ImageHistory_old;</statement>
+
+ <statement mode="plain">RENAME TABLE ImageRelations TO ImageRelations_old;</statement>
+ <statement mode="plain">CREATE TABLE ImageRelations LIKE ImageRelations_old;</statement>
+ <statement mode="plain">ALTER TABLE ImageRelations
ADD CONSTRAINT ImageRelations_ImagesS FOREIGN KEY (subject) REFERENCES Images (id) ON DELETE CASCADE ON UPDATE CASCADE,
ADD CONSTRAINT ImageRelations_ImagesO FOREIGN KEY (object) REFERENCES Images (id) ON DELETE CASCADE ON UPDATE CASCADE,
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE TagProperties
+ <statement mode="plain">INSERT IGNORE INTO ImageRelations SELECT * FROM ImageRelations_old;</statement>
+
+ <statement mode="plain">RENAME TABLE TagProperties TO TagProperties_old;</statement>
+ <statement mode="plain">CREATE TABLE TagProperties LIKE TagProperties_old;</statement>
+ <statement mode="plain">ALTER TABLE TagProperties
ADD CONSTRAINT TagProperties_Tags FOREIGN KEY (tagid) REFERENCES Tags (id) ON DELETE CASCADE ON UPDATE CASCADE,
ENGINE InnoDB;</statement>
- <statement mode="plain">ALTER IGNORE TABLE ImageTagProperties
+ <statement mode="plain">INSERT IGNORE INTO TagProperties SELECT * FROM TagProperties_old;</statement>
+
+ <statement mode="plain">RENAME TABLE ImageTagProperties TO ImageTagProperties_old;</statement>
+ <statement mode="plain">CREATE TABLE ImageTagProperties LIKE ImageTagProperties_old;</statement>
+ <statement mode="plain">ALTER TABLE ImageTagProperties
ADD CONSTRAINT ImageTagProperties_Images FOREIGN KEY (imageid) REFERENCES Images (id) ON DELETE CASCADE ON UPDATE CASCADE,
ADD CONSTRAINT ImageTagProperties_Tags FOREIGN KEY (tagid) REFERENCES Tags (id) ON DELETE CASCADE ON UPDATE CASCADE,
ENGINE InnoDB;</statement>
- <statement mode="plain">SET SESSION FOREIGN_KEY_CHECKS=1;</statement>
- <statement mode="plain">SET SESSION OLD_ALTER_TABLE=0;</statement>
+ <statement mode="plain">INSERT IGNORE INTO ImageTagProperties SELECT * FROM ImageTagProperties_old;</statement>
+
+ <statement mode="plain">DROP TABLE ImageTagProperties_old;</statement>
+ <statement mode="plain">DROP TABLE TagProperties_old;</statement>
+ <statement mode="plain">DROP TABLE ImageRelations_old;</statement>
+ <statement mode="plain">DROP TABLE ImageHistory_old;</statement>
+ <statement mode="plain">DROP TABLE Settings_old;</statement>
+ <statement mode="plain">DROP TABLE DownloadHistory_old;</statement>
+ <statement mode="plain">DROP TABLE ImageProperties_old;</statement>
+ <statement mode="plain">DROP TABLE ImageTags_old;</statement>
+ <statement mode="plain">DROP TABLE Tags_old;</statement>
+ <statement mode="plain">DROP TABLE ImageCopyright_old;</statement>
+ <statement mode="plain">DROP TABLE ImageComments_old;</statement>
+ <statement mode="plain">DROP TABLE ImagePositions_old;</statement>
+ <statement mode="plain">DROP TABLE VideoMetadata_old;</statement>
+ <statement mode="plain">DROP TABLE ImageMetadata_old;</statement>
+ <statement mode="plain">DROP TABLE ImageInformation_old;</statement>
+ <statement mode="plain">DROP TABLE ImageHaarMatrix_old;</statement>
+ <statement mode="plain">DROP TABLE Images_old;</statement>
+ <statement mode="plain">DROP TABLE Albums_old;</statement>
+ <statement mode="plain">DROP TABLE AlbumRoots_old;</statement>
</dbaction>
<dbaction name="UpdateThumbnailsDBSchemaFromV1ToV2" mode="transaction">
--
cgit v0.11.2
++++++ digikam-5.8.0.fix-db-migration-0002.patch ++++++
>From 6c8398db5c57a550e7b14f48a0701b28f0eca840 Mon Sep 17 00:00:00 2001
From: Maik Qualmann <metzpinguin(a)gmail.com>
Date: Mon, 15 Jan 2018 22:57:11 +0100
Subject: small fix for the schema update
---
data/database/dbconfig.xml.cmake.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/database/dbconfig.xml.cmake.in b/data/database/dbconfig.xml.cmake.in
index 2c5008f..a1cd69f 100644
--- a/data/database/dbconfig.xml.cmake.in
+++ b/data/database/dbconfig.xml.cmake.in
@@ -2147,7 +2147,7 @@
ADD CONSTRAINT Tags_Images FOREIGN KEY (icon) REFERENCES Images (id) ON DELETE SET NULL ON UPDATE CASCADE,
ADD UNIQUE(pid, name(100)),
ENGINE InnoDB;</statement>
- <statement mode="plain">INSERT IGNORE INTO Tags SELECT * FROM Tags_old;</statement>
+ <statement mode="plain">REPLACE INTO Tags SELECT * FROM Tags_old;</statement>
<statement mode="plain">SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO';</statement>
<statement mode="plain">REPLACE INTO Tags (id, pid, name, icon, iconkde, lft, rgt) VALUES (0, -1, '_Digikam_root_tag_', NULL, NULL,
(SELECT MIN(tl.lft) FROM Tags AS tl),
--
cgit v0.11.2
++++++ digikam-5.8.0.fix-db-migration-0003.patch ++++++
>From 443ce0e848a0da4fa7c80dd5b077fb6b8a545126 Mon Sep 17 00:00:00 2001
From: Maik Qualmann <metzpinguin(a)gmail.com>
Date: Fri, 19 Jan 2018 07:07:08 +0100
Subject: disable foreign key checks temporarily for the Tags table BUGS:
388824
---
data/database/dbconfig.xml.cmake.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/database/dbconfig.xml.cmake.in b/data/database/dbconfig.xml.cmake.in
index a1cd69f..a98434b 100644
--- a/data/database/dbconfig.xml.cmake.in
+++ b/data/database/dbconfig.xml.cmake.in
@@ -2141,6 +2141,7 @@
ENGINE InnoDB;</statement>
<statement mode="plain">INSERT IGNORE INTO ImageCopyright SELECT * FROM ImageCopyright_old;</statement>
+ <statement mode="plain">SET FOREIGN_KEY_CHECKS=0;</statement>
<statement mode="plain">RENAME TABLE Tags TO Tags_old;</statement>
<statement mode="plain">CREATE TABLE Tags LIKE Tags_old;</statement>
<statement mode="plain">ALTER TABLE Tags
@@ -2154,6 +2155,7 @@
(SELECT MAX(tr.rgt) FROM Tags AS tr));</statement>
<statement mode="plain">SET SQL_MODE=@OLD_SQL_MODE;</statement>
<statement mode="plain">UPDATE Tags SET icon = NULL WHERE icon = 0;</statement>
+ <statement mode="plain">SET FOREIGN_KEY_CHECKS=1;</statement>
<statement mode="plain">RENAME TABLE ImageTags TO ImageTags_old;</statement>
<statement mode="plain">CREATE TABLE ImageTags LIKE ImageTags_old;</statement>
--
cgit v0.11.2
++++++ digikam-5.8.0.fix-db-migration-0004.patch ++++++
>From ceb41a7f89ddf9716507466861828925357ab3f3 Mon Sep 17 00:00:00 2001
From: Maik Qualmann <metzpinguin(a)gmail.com>
Date: Fri, 19 Jan 2018 19:59:44 +0100
Subject: drop old table if new run required
---
data/database/dbconfig.xml.cmake.in | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/data/database/dbconfig.xml.cmake.in b/data/database/dbconfig.xml.cmake.in
index a98434b..3ec790f 100644
--- a/data/database/dbconfig.xml.cmake.in
+++ b/data/database/dbconfig.xml.cmake.in
@@ -2024,6 +2024,7 @@
<statement mode="plain">CALL drop_foreign_key('TagProperties', 'TagProperties_Tags');</statement>
<statement mode="plain">CALL drop_foreign_key('ImageTagProperties', 'ImageTagProperties_Images');</statement>
<statement mode="plain">CALL drop_foreign_key('ImageTagProperties', 'ImageTagProperties_Tags');</statement>
+
<statement mode="plain">ALTER TABLE AlbumRoots MODIFY COLUMN label LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci;</statement>
<statement mode="plain">ALTER TABLE AlbumRoots MODIFY COLUMN identifier LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci;</statement>
<statement mode="plain">ALTER TABLE AlbumRoots MODIFY COLUMN specificPath LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci;</statement>
@@ -2063,6 +2064,26 @@
<statement mode="plain">ALTER TABLE ImageTagProperties MODIFY COLUMN property TEXT CHARACTER SET utf8 COLLATE utf8_general_ci;</statement>
<statement mode="plain">ALTER TABLE ImageTagProperties MODIFY COLUMN value LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS ImageTagProperties_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS TagProperties_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS ImageRelations_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS ImageHistory_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS Settings_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS DownloadHistory_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS ImageProperties_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS ImageTags_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS Tags_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS ImageCopyright_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS ImageComments_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS ImagePositions_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS VideoMetadata_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS ImageMetadata_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS ImageInformation_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS ImageHaarMatrix_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS Images_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS Albums_old;</statement>
+ <statement mode="plain">DROP TABLE IF EXISTS AlbumRoots_old;</statement>
+
<statement mode="plain">RENAME TABLE AlbumRoots TO AlbumRoots_old;</statement>
<statement mode="plain">CREATE TABLE AlbumRoots LIKE AlbumRoots_old;</statement>
<statement mode="plain">ALTER TABLE AlbumRoots
--
cgit v0.11.2
1
0
Hello community,
here is the log from the commit of package laszip for openSUSE:Factory checked in at 2018-01-30 15:42:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/laszip (Old)
and /work/SRC/openSUSE:Factory/.laszip.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "laszip"
Tue Jan 30 15:42:45 2018 rev:3 rq:570380 version:3.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/laszip/laszip.changes 2016-07-14 09:44:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.laszip.new/laszip.changes 2018-01-30 15:42:47.283130434 +0100
@@ -1,0 +2,19 @@
+Wed Jan 24 07:15:06 UTC 2018 - bruno(a)ioda-net.ch
+
+- Packaging :
+ + Remove -test package and %check section, tests are no more
+ autoincluded by upstream
+ + Adjust FLAGS laszip need -ldl, and be sure %optflags are used
+ + Create new liblas_api package
+ + Fix list of file
+ + Use %license if possible
+ + move to cmake build following upstream
+ + Added 0bf1c60.patch fixing .so loading
+
+- Update to 3.1.1 version.
+ + sover change from 6 to 3
+ + 3.1.0 introduce support for LAZ 1.4
+ + New "dll" API replace previous API
+ + See all changes in Changelog
+
+-------------------------------------------------------------------
Old:
----
laszip-src-2.2.0.tar.bz2
lgpl-2.1.txt
New:
----
0bf1c60.patch
laszip-src-3.1.1.tar.gz
laszip-src-3.1.1.tar.gz.md5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ laszip.spec ++++++
--- /var/tmp/diff_new_pack.3zbery/_old 2018-01-30 15:42:47.963098690 +0100
+++ /var/tmp/diff_new_pack.3zbery/_new 2018-01-30 15:42:47.971098316 +0100
@@ -1,7 +1,7 @@
#
# spec file for package laszip
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2014 Ioda-Net Sàrl, Charmoille, Switzerland. Bruno Friedmann (tigerfoot)
#
# All modifications and additions to the file contributed by third parties
@@ -17,16 +17,21 @@
#
+#
+%define sover 3
+
Name: laszip
-Version: 2.2.0
+Version: 3.1.1
Release: 0
Summary: Compression library supporting ASPRS LAS format data
License: LGPL-2.1+
Group: Development/Libraries/C and C++
Url: http://www.laszip.org/
-Source0: https://github.com/LASzip/LASzip/releases/download/v%{version}/laszip-src-%…
-# Upstream issue pull request Update COPYING #10 on 2014-08-21
-Source2: lgpl-2.1.txt
+Source0: https://github.com/LASzip/LASzip/releases/download/%{version}/laszip-src-%{…
+Source1: https://github.com/LASzip/LASzip/releases/download/%{version}/laszip-src-%{…
+# Upstream [PATCH] Load .so dll on non-apple
+Patch0: https://github.com/LASzip/LASzip/commit/0bf1c60.patch
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -39,11 +44,11 @@
data. The BSD-licensed libLAS and the LGPL-licensed LASlib can take advantage of
LASzip to read and write compressed data.
-%package test
-Summary: Test for %{name}
-Group: Development/Libraries/C and C++
+%package -n lib%{name}%{sover}
+Summary: Library files for %{name}
+Group: System/Libraries
-%description test
+%description -n lib%{name}%{sover}
A free product of rapidlasso GmbH - quickly turns bulky LAS files into
compact LAZ files without information loss. LASzip is a compression library that
was developed by Martin Isenburg for compressing ASPRS LAS format data in his
@@ -52,27 +57,23 @@
data. The BSD-licensed libLAS and the LGPL-licensed LASlib can take advantage of
LASzip to read and write compressed data.
-This package contain only the laszippertest tool
+This package contain only the dynamic build.
-%package -n lib%{name}6
-Summary: Library files for %{name}
+%package -n lib%{name}_api%{sover}
+Summary: API library files for lib%{name}
+# Packager comment are we sure this api can live alone ?
+#Requires: lib%%{name}%%{sover} = %%{version}
Group: System/Libraries
-%description -n lib%{name}6
-A free product of rapidlasso GmbH - quickly turns bulky LAS files into
-compact LAZ files without information loss. LASzip is a compression library that
-was developed by Martin Isenburg for compressing ASPRS LAS format data in his
-LAStools. It has been provided as an LGPL-licensed stand-alone software library
-to allow other softwares that handle LAS data to read and write LASzip-compressed
-data. The BSD-licensed libLAS and the LGPL-licensed LASlib can take advantage of
-LASzip to read and write compressed data.
-
+%description -n lib%{name}_api%{sover}
+API library for %{name}
This package contain only the dynamic build.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries/C and C++
-Requires: lib%{name}6 = %{version}
+Requires: lib%{name}%{sover} = %{version}
+Requires: lib%{name}_api%{sover} = %{version}
%description devel
Headers and development files for %{name} needed to develop
@@ -81,44 +82,62 @@
%prep
%setup -q -n laszip-src-%{version}
-sed -i 's/-O3//g' ./configure
-cp -f %{SOURCE2} COPYING
+%patch0 -p1
%build
-export CFLAGS="%{optflags} -fno-strict-aliasing -fPIE -pie"
-export CXXFLAGS="%{optflags} -fno-strict-aliasing -fPIE -pie"
-export LDFLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now -pie"
-%configure
-make %{?_smp_mflags}
+# laszip need dlopen,dlsym,dlclose
+%cmake \
+ -DCMAKE_C_FLAGS="%{optflags} -fno-strict-aliasing -fPIE -pie" \
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -fno-strict-aliasing -fPIE -pie" \
+ -DCMAKE_CXX_FLAGS="%{optflags} -fno-strict-aliasing -fPIE -pie" \
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -fno-strict-aliasing -fPIE -pie" \
+ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -Wl,--no-as-needed -ldl"
+
+make V=1 %{?_smp_mflags}
%install
-%make_install
+%cmake_install
# Do not ship any static libraries or .la files
find %{buildroot} -type f \( -name '*.a' -o -name '*.la' \) -delete -print
+rm -rf %{buildroot}/usr/lib/debug/
-%check
-make %{?_smp_mflags} check
+# No more available in 3?
+#%%check
+#make %%{?_smp_mflags} check
-%post -n lib%{name}6 -p /sbin/ldconfig
-%postun -n lib%{name}6 -p /sbin/ldconfig
+%post -n lib%{name}%{sover} -p /sbin/ldconfig
+%postun -n lib%{name}%{sover} -p /sbin/ldconfig
+
+%post -n lib%{name}_api%{sover} -p /sbin/ldconfig
+%postun -n lib%{name}_api%{sover} -p /sbin/ldconfig
%files devel
%defattr(-,root,root)
%doc ChangeLog AUTHORS COPYING
-%{_includedir}/lasunzipper.hpp
-%{_includedir}/laszip.hpp
-%{_includedir}/laszipexport.hpp
-%{_includedir}/laszipper.hpp
+%{_includedir}/%{name}_api_version.h
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/%{name}_api.h
%{_libdir}/lib%{name}.so
+%{_libdir}/lib%{name}_api.so
-%files test
+%files -n lib%{name}%{sover}
%defattr(-,root,root)
-%doc ChangeLog AUTHORS COPYING
-%{_bindir}/laszippertest
+%doc ChangeLog AUTHORS
+%if 0%{?leap_version} >= 420200 || 0%{?suse_version} > 1320
+%license COPYING
+%else
+%doc COPYING
+%endif
+%{_libdir}/lib%{name}.so.*
-%files -n lib%{name}6
+%files -n lib%{name}_api%{sover}
%defattr(-,root,root)
-%doc ChangeLog AUTHORS COPYING
-%{_libdir}/lib%{name}.so.*
+%doc ChangeLog AUTHORS
+%if 0%{?leap_version} >= 420200 || 0%{?suse_version} > 1320
+%license COPYING
+%else
+%doc COPYING
+%endif
+%{_libdir}/lib%{name}_api.so.*
%changelog
++++++ 0bf1c60.patch ++++++
>From d781bf50da33d1789cce3a17777d91e279d0a289 Mon Sep 17 00:00:00 2001
From: Pete Gadomski <pete.gadomski(a)gmail.com>
Date: Thu, 19 Oct 2017 17:06:55 +0000
Subject: [PATCH] Load .so dll on non-apple
This platform checking is...dubious...but this was the Minimum Required
To Work on a debian system.
---
dll/laszip_api.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dll/laszip_api.c b/dll/laszip_api.c
index 007e080..83c09bf 100644
--- a/dll/laszip_api.c
+++ b/dll/laszip_api.c
@@ -958,8 +958,10 @@ laszip_I32 laszip_load_dll()
// Load DLL file
#ifdef _WIN32
laszip_HINSTANCE = LoadLibrary(TEXT("LASzip.dll"));
-#else
+#elif __APPLE__
laszip_HINSTANCE = LoadLibrary("liblaszip.dylib", RTLD_NOW);
+#else
+ laszip_HINSTANCE = LoadLibrary("liblaszip.so", RTLD_NOW);
#endif
if (laszip_HINSTANCE == NULL) {
return 1;
++++++ laszip-src-3.1.1.tar.gz.md5 ++++++
MD5 (laszip-src-3.1.1.tar.gz) = d31fc8b1fc070336a1825beb32595153
1
0
Hello community,
here is the log from the commit of package kopano-webapp for openSUSE:Factory checked in at 2018-01-30 15:42:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kopano-webapp (Old)
and /work/SRC/openSUSE:Factory/.kopano-webapp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kopano-webapp"
Tue Jan 30 15:42:43 2018 rev:6 rq:570231 version:3.4.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/kopano-webapp/kopano-webapp.changes 2018-01-10 23:37:05.990584923 +0100
+++ /work/SRC/openSUSE:Factory/.kopano-webapp.new/kopano-webapp.changes 2018-01-30 15:42:46.131184213 +0100
@@ -1,0 +2,23 @@
+Mon Jan 22 23:10:06 UTC 2018 - bosim(a)opensuse.org
+
+- Suggesting php-opcache (speeds up WebApp quite some)
+
+-------------------------------------------------------------------
+Sat Jan 20 14:19:21 UTC 2018 - bosim(a)opensuse.org
+
+- Update to 3.4.4 final, improvements:
+ * KW-1098 Indicate in which calendar an appointment will be
+ created
+ * KW-2060 Make setdefaultsignature python 3 compatible
+ * KW-2204 Webapp opens the public store on every request
+ * KW-2205 Webapp lazy load settings
+ * KW-2218 Reduce timeout delay for showing suggestions
+ * KW-2222 Add jenkinsfile for running tests in webapp repository
+ * KW-2230 Ship basic apparmor profiles
+- Bugfixes:
+ * KW-2091 Distribution list not shown as suggested recipient
+ * KW-2257 Uncaught type error after upgrade to webapp 3.4.3
+- Full changelog:
+ https://documentation.kopano.io/kopano_changelog/webapp.html
+
+-------------------------------------------------------------------
Old:
----
kopano-webapp-3.4.3.tar.xz
New:
----
kopano-webapp-3.4.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kopano-webapp.spec ++++++
--- /var/tmp/diff_new_pack.tNXimO/_old 2018-01-30 15:42:47.007143318 +0100
+++ /var/tmp/diff_new_pack.tNXimO/_new 2018-01-30 15:42:47.011143132 +0100
@@ -20,7 +20,7 @@
%define langdir %{_datadir}/%{name}/server/language
%define plugindir %{_datadir}/%{name}/plugins
Name: kopano-webapp
-Version: 3.4.3
+Version: 3.4.4
Release: 0
Summary: Improved WebApp for Kopano
License: AGPL-3.0
@@ -36,6 +36,7 @@
Requires: php-mapi
Requires: php-openssl
Requires: php-zlib
+Suggests: php-opcache
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%if 0%{?suse_version}
@@ -61,7 +62,7 @@
Provides translations to the package %{name}.
%package contactfax
-Version: 3.4.3
+Version: 3.4.4
Release: 0
Summary: Contact fax plugin for kopano-webapp
Group: Productivity/Networking/Email/Clients
@@ -71,7 +72,7 @@
field of the email.
%package folderwidgets
-Version: 3.4.3
+Version: 3.4.4
Release: 0
Summary: Folder widgets plugin for kopano-webapp
Group: Productivity/Networking/Email/Clients
@@ -81,7 +82,7 @@
default folders for a user.
%package gmaps
-Version: 3.4.3
+Version: 3.4.4
Release: 0
Summary: Google Maps plugin for kopano-webapp
Group: Productivity/Networking/Email/Clients
@@ -90,7 +91,7 @@
Shows contact address on Google Maps.
%package pimfolder
-Version: 3.4.3
+Version: 3.4.4
Release: 0
Summary: Plugin for kopano-webapp to quickly move mail into another folder
Group: Productivity/Networking/Email/Clients
@@ -99,7 +100,7 @@
Kopano PIM plugin, allows you to set-up a folder quickly moving your mail to another folder; like "Archive" in GTD
%package quickitems
-Version: 3.4.3
+Version: 3.4.4
Release: 0
Summary: Quick Items plugin for kopano-webapp
Group: Productivity/Networking/Email/Clients
@@ -109,7 +110,7 @@
Tasks and Notes.
%package titlecounter
-Version: 3.4.3
+Version: 3.4.4
Release: 0
Summary: Title counter plugin for kopano-webapp
Group: Productivity/Networking/Email/Clients
@@ -118,7 +119,7 @@
Plugin to show number of unread messages in the window title.
%package webappmanual
-Version: 3.4.3
+Version: 3.4.4
Release: 0
Summary: Manual plugin for kopano-webapp
Group: Productivity/Networking/Email/Clients
@@ -127,7 +128,7 @@
Plugin with manual for Kopano WebApp
%package zdeveloper
-Version: 3.4.3
+Version: 3.4.4
Release: 0
Summary: Developer plugin for kopano-webapp
Group: Development/Tools/Debuggers
++++++ _service ++++++
--- /var/tmp/diff_new_pack.tNXimO/_old 2018-01-30 15:42:47.039141825 +0100
+++ /var/tmp/diff_new_pack.tNXimO/_new 2018-01-30 15:42:47.039141825 +0100
@@ -2,10 +2,10 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://stash.kopano.io/scm/kw/kopano-webapp.git</param>
- <param name="revision">v3.4.3</param>
+ <param name="revision">v3.4.4</param>
<param name="filename">kopano-webapp</param>
- <param name="parent-tag">v3.4.3</param>
- <param name="versionformat">3.4.3</param>
+ <param name="parent-tag">v3.4.4</param>
+ <param name="versionformat">3.4.4</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
++++++ kopano-webapp-3.4.3.tar.xz -> kopano-webapp-3.4.4.tar.xz ++++++
/work/SRC/openSUSE:Factory/kopano-webapp/kopano-webapp-3.4.3.tar.xz /work/SRC/openSUSE:Factory/.kopano-webapp.new/kopano-webapp-3.4.4.tar.xz differ: char 27, line 1
1
0
Hello community,
here is the log from the commit of package zathura-plugin-ps for openSUSE:Factory checked in at 2018-01-30 15:42:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zathura-plugin-ps (Old)
and /work/SRC/openSUSE:Factory/.zathura-plugin-ps.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zathura-plugin-ps"
Tue Jan 30 15:42:38 2018 rev:4 rq:569898 version:0.2.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/zathura-plugin-ps/zathura-plugin-ps.changes 2017-05-29 22:19:40.667751761 +0200
+++ /work/SRC/openSUSE:Factory/.zathura-plugin-ps.new/zathura-plugin-ps.changes 2018-01-30 15:42:38.495540686 +0100
@@ -1,0 +2,6 @@
+Fri Jan 26 14:22:56 UTC 2018 - mimi.vx(a)gmail.com
+
+- update to 0.2.5
+* adapt to new plugin interface
+
+-------------------------------------------------------------------
Old:
----
zathura-ps-0.2.4.tar.gz
New:
----
zathura-ps-0.2.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zathura-plugin-ps.spec ++++++
--- /var/tmp/diff_new_pack.qWFnHS/_old 2018-01-30 15:42:39.715483732 +0100
+++ /var/tmp/diff_new_pack.qWFnHS/_new 2018-01-30 15:42:39.719483545 +0100
@@ -1,7 +1,7 @@
#
# spec file for package zathura-plugin-ps
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,19 +18,19 @@
%define realname zathura-ps
Name: zathura-plugin-ps
-Version: 0.2.4
+Version: 0.2.5
Release: 0
Summary: PS support for zathura via libspectre
License: Zlib
Group: Productivity/Office/Other
Url: https://pwmt.org/projects/%{realname}/
Source: https://pwmt.org/projects/%{realname}/download/%{realname}-%{version}.tar.gz
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(girara-gtk3)
BuildRequires: pkgconfig(libspectre)
BuildRequires: pkgconfig(zathura)
Requires: zathura
Provides: zathura-ps-plugin
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The zathura-ps plugin adds PostScript support to zathura by using the libspectre library.
@@ -47,11 +47,9 @@
find %{buildroot} -name "*.desktop" -delete -print
%post -n %{name} -p /sbin/ldconfig
-
%postun -n %{name} -p /sbin/ldconfig
%files -n %{name}
-%defattr(-,root,root)
%doc AUTHORS LICENSE
%dir %{_libdir}/zathura
%{_libdir}/zathura/ps.so
++++++ zathura-ps-0.2.4.tar.gz -> zathura-ps-0.2.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-ps-0.2.4/Makefile new/zathura-ps-0.2.5/Makefile
--- old/zathura-ps-0.2.4/Makefile 2017-01-11 22:12:17.000000000 +0100
+++ new/zathura-ps-0.2.5/Makefile 2017-12-21 14:21:17.000000000 +0100
@@ -10,12 +10,6 @@
OBJECTS = ${SOURCE:.c=.o}
DOBJECTS = ${SOURCE:.c=.do}
-ifneq "$(WITH_CAIRO)" "0"
-CPPFLAGS += -DHAVE_CAIRO
-INCS += $(CAIRO_INC)
-LIBS += $(CAIRO_LIB)
-endif
-
CPPFLAGS += "-DVERSION_MAJOR=${VERSION_MAJOR}"
CPPFLAGS += "-DVERSION_MINOR=${VERSION_MINOR}"
CPPFLAGS += "-DVERSION_REV=${VERSION_REV}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-ps-0.2.4/config.mk new/zathura-ps-0.2.5/config.mk
--- old/zathura-ps-0.2.4/config.mk 2017-01-11 22:12:17.000000000 +0100
+++ new/zathura-ps-0.2.5/config.mk 2017-12-21 14:21:17.000000000 +0100
@@ -2,11 +2,11 @@
VERSION_MAJOR = 0
VERSION_MINOR = 2
-VERSION_REV = 4
+VERSION_REV = 5
VERSION = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}
# minimum required zathura version
-ZATHURA_MIN_VERSION = 0.2.0
+ZATHURA_MIN_VERSION = 0.3.8
ZATHURA_VERSION_CHECK ?= $(shell pkg-config --atleast-version=$(ZATHURA_MIN_VERSION) zathura; echo $$?)
ZATHURA_GTK_VERSION ?= $(shell pkg-config --variable=GTK_VERSION zathura)
@@ -34,8 +34,8 @@
PLUGINDIR = ${LIBDIR}/zathura
endif
-INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${ZATHURA_INC}
-LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB}
+INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC}
+LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB}
# compiler flags
CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
@@ -46,9 +46,6 @@
# debug
DFLAGS ?= -g
-# build with cairo support?
-WITH_CAIRO ?= 1
-
# compiler
CC ?= gcc
LD ?= ld
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-ps-0.2.4/document.c new/zathura-ps-0.2.5/document.c
--- old/zathura-ps-0.2.4/document.c 2017-01-11 22:12:17.000000000 +0100
+++ new/zathura-ps-0.2.5/document.c 2017-12-21 14:21:17.000000000 +0100
@@ -47,8 +47,9 @@
}
zathura_error_t
-ps_document_free(zathura_document_t* document, SpectreDocument* spectre_document)
+ps_document_free(zathura_document_t* document, void* data)
{
+ SpectreDocument* spectre_document = data;
if (document == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
@@ -62,8 +63,9 @@
}
zathura_error_t
-ps_document_save_as(zathura_document_t* document, SpectreDocument* spectre_document, const char* path)
+ps_document_save_as(zathura_document_t* document, void* data, const char* path)
{
+ SpectreDocument* spectre_document = data;
if (document == NULL || spectre_document == NULL || path == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-ps-0.2.4/meta.c new/zathura-ps-0.2.5/meta.c
--- old/zathura-ps-0.2.4/meta.c 2017-01-11 22:12:17.000000000 +0100
+++ new/zathura-ps-0.2.5/meta.c 2017-12-21 14:21:17.000000000 +0100
@@ -3,9 +3,9 @@
#include "plugin.h"
girara_list_t*
-ps_document_get_information(zathura_document_t* document, SpectreDocument*
- spectre_document, zathura_error_t* error)
+ps_document_get_information(zathura_document_t* document, void* data, zathura_error_t* error)
{
+ SpectreDocument* spectre_document = data;
if (document == NULL || spectre_document == NULL) {
if (error != NULL) {
*error = ZATHURA_ERROR_INVALID_ARGUMENTS;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-ps-0.2.4/page.c new/zathura-ps-0.2.5/page.c
--- old/zathura-ps-0.2.4/page.c 2017-01-11 22:12:17.000000000 +0100
+++ new/zathura-ps-0.2.5/page.c 2017-12-21 14:21:17.000000000 +0100
@@ -3,7 +3,7 @@
#include "plugin.h"
zathura_error_t
-ps_page_init(zathura_page_t* page, SpectrePage* spectre_page)
+ps_page_init(zathura_page_t* page)
{
if (page == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
@@ -29,12 +29,13 @@
}
zathura_error_t
-ps_page_clear(zathura_page_t* page, SpectrePage* spectre_page)
+ps_page_clear(zathura_page_t* page, void* data)
{
if (page == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
+ SpectrePage* spectre_page = data;
if (spectre_page != NULL) {
spectre_page_free(spectre_page);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-ps-0.2.4/plugin.c new/zathura-ps-0.2.5/plugin.c
--- old/zathura-ps-0.2.4/plugin.c 2017-01-11 22:12:17.000000000 +0100
+++ new/zathura-ps-0.2.5/plugin.c 2017-12-21 14:21:17.000000000 +0100
@@ -2,25 +2,19 @@
#include "plugin.h"
-void
-register_functions(zathura_plugin_functions_t* functions)
-{
- functions->document_open = (zathura_plugin_document_open_t) ps_document_open;
- functions->document_free = (zathura_plugin_document_free_t) ps_document_free;
- functions->page_init = (zathura_plugin_page_init_t) ps_page_init;
- functions->page_clear = (zathura_plugin_page_clear_t) ps_page_clear;
- functions->page_render = (zathura_plugin_page_render_t) ps_page_render;
- functions->document_save_as = (zathura_plugin_document_save_as_t) ps_document_save_as;
- functions->document_get_information = (zathura_plugin_document_get_information_t) ps_document_get_information;
-#if HAVE_CAIRO
- functions->page_render_cairo = (zathura_plugin_page_render_cairo_t) ps_page_render_cairo;
-#endif
-}
-
-ZATHURA_PLUGIN_REGISTER(
+ZATHURA_PLUGIN_REGISTER_WITH_FUNCTIONS(
"ps",
VERSION_MAJOR, VERSION_MINOR, VERSION_REV,
- register_functions,
+ ZATHURA_PLUGIN_FUNCTIONS({
+ .document_open = ps_document_open,
+ .document_free = ps_document_free,
+ .page_init = ps_page_init,
+ .page_clear = ps_page_clear,
+ .page_render = ps_page_render,
+ .document_save_as = ps_document_save_as,
+ .document_get_information = ps_document_get_information,
+ .page_render_cairo = ps_page_render_cairo,
+ }),
ZATHURA_PLUGIN_MIMETYPES({
"application/postscript",
"application/eps",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-ps-0.2.4/plugin.h new/zathura-ps-0.2.5/plugin.h
--- old/zathura-ps-0.2.4/plugin.h 2017-01-11 22:12:17.000000000 +0100
+++ new/zathura-ps-0.2.5/plugin.h 2017-12-21 14:21:17.000000000 +0100
@@ -6,10 +6,7 @@
#include <stdbool.h>
#include <libspectre/spectre.h>
#include <zathura/plugin-api.h>
-
-#if HAVE_CAIRO
#include <cairo.h>
-#endif
/**
* Open a PostScript document
@@ -18,7 +15,7 @@
* @return ZATHURA_ERROR_OK if no error occurred otherwise see
* zathura_error_t
*/
-zathura_error_t ps_document_open(zathura_document_t* document);
+GIRARA_HIDDEN zathura_error_t ps_document_open(zathura_document_t* document);
/**
* Closes and frees the internal document structure
@@ -27,7 +24,7 @@
* @return ZATHURA_ERROR_OK if no error occurred otherwise see
* zathura_error_t
*/
-zathura_error_t ps_document_free(zathura_document_t* document, SpectreDocument* spectre_document);
+GIRARA_HIDDEN zathura_error_t ps_document_free(zathura_document_t* document, void* spectre_document);
/**
* Saves the document to the given path
@@ -37,7 +34,7 @@
* @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
-zathura_error_t ps_document_save_as(zathura_document_t* document, SpectreDocument* spectre_document, const char* path);
+GIRARA_HIDDEN zathura_error_t ps_document_save_as(zathura_document_t* document, void* spectre_document, const char* path);
/**
* Returns a list of document information entries of the document
@@ -47,7 +44,7 @@
* error occurred
* @return List of information entries or NULL if an error occurred
*/
-girara_list_t* ps_document_get_information(zathura_document_t* document, SpectreDocument*
+GIRARA_HIDDEN girara_list_t* ps_document_get_information(zathura_document_t* document, void*
spectre_document, zathura_error_t* error);
/**
@@ -57,7 +54,7 @@
* @return ZATHURA_ERROR_OK if no error occurred otherwise see
* zathura_error_t
*/
-zathura_error_t ps_page_init(zathura_page_t* page, SpectrePage* spectre_page);
+GIRARA_HIDDEN zathura_error_t ps_page_init(zathura_page_t* page);
/**
* Renders a page and returns a allocated image buffer which has to be freed
@@ -68,9 +65,8 @@
* error occurred
* @return Image buffer or NULL if an error occurred
*/
-zathura_image_buffer_t* ps_page_render(zathura_page_t* page, SpectrePage* spectre_page, zathura_error_t* error);
+GIRARA_HIDDEN zathura_image_buffer_t* ps_page_render(zathura_page_t* page, void* spectre_page, zathura_error_t* error);
-#if HAVE_CAIRO
/**
* Renders a page onto a cairo object
*
@@ -80,8 +76,7 @@
* @return ZATHURA_ERROR_OK if no error occurred otherwise see
* zathura_error_t
*/
-zathura_error_t ps_page_render_cairo(zathura_page_t* page, SpectrePage* spectre_page, cairo_t* cairo, bool printing);
-#endif
+GIRARA_HIDDEN zathura_error_t ps_page_render_cairo(zathura_page_t* page, void* spectre_page, cairo_t* cairo, bool printing);
/**
* Frees a PostScript page
@@ -90,6 +85,6 @@
* @return ZATHURA_ERROR_OK if no error occurred otherwise see
* zathura_error_t
*/
-zathura_error_t ps_page_clear(zathura_page_t* page, SpectrePage* spectre_page);
+GIRARA_HIDDEN zathura_error_t ps_page_clear(zathura_page_t* page, void* spectre_page);
#endif // PS_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-ps-0.2.4/render.c new/zathura-ps-0.2.5/render.c
--- old/zathura-ps-0.2.4/render.c 2017-01-11 22:12:17.000000000 +0100
+++ new/zathura-ps-0.2.5/render.c 2017-12-21 14:21:17.000000000 +0100
@@ -3,15 +3,14 @@
#include <glib.h>
#include <stdlib.h>
-#if HAVE_CAIRO
#include <cairo.h>
-#endif
#include "plugin.h"
zathura_image_buffer_t*
-ps_page_render(zathura_page_t* page, SpectrePage* spectre_page, zathura_error_t* error)
+ps_page_render(zathura_page_t* page, void* data, zathura_error_t* error)
{
+ SpectrePage* spectre_page = data;
if (page == NULL) {
if (error != NULL) {
*error = ZATHURA_ERROR_INVALID_ARGUMENTS;
@@ -84,15 +83,14 @@
return NULL;
}
-#if HAVE_CAIRO
zathura_error_t
-ps_page_render_cairo(zathura_page_t* page, SpectrePage* spectre_page, cairo_t* cairo, bool GIRARA_UNUSED(printing))
+ps_page_render_cairo(zathura_page_t* page, void* data, cairo_t* cairo, bool GIRARA_UNUSED(printing))
{
+ SpectrePage* ps_page = data;
if (page == NULL || cairo == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
- SpectrePage* ps_page = (SpectrePage*) zathura_page_get_data(page);;
cairo_surface_t* surface = cairo_get_target(cairo);
if (ps_page == NULL || surface == NULL ||
@@ -145,4 +143,3 @@
return ZATHURA_ERROR_OK;
}
-#endif
1
0
30 Jan '18
Hello community,
here is the log from the commit of package zathura-plugin-pdf-poppler for openSUSE:Factory checked in at 2018-01-30 15:42:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zathura-plugin-pdf-poppler (Old)
and /work/SRC/openSUSE:Factory/.zathura-plugin-pdf-poppler.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zathura-plugin-pdf-poppler"
Tue Jan 30 15:42:34 2018 rev:5 rq:569897 version:0.2.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/zathura-plugin-pdf-poppler/zathura-plugin-pdf-poppler.changes 2017-05-29 22:19:32.364924143 +0200
+++ /work/SRC/openSUSE:Factory/.zathura-plugin-pdf-poppler.new/zathura-plugin-pdf-poppler.changes 2018-01-30 15:42:35.571677187 +0100
@@ -1,0 +2,6 @@
+Fri Jan 26 14:25:49 UTC 2018 - mimi.vx(a)gmail.com
+
+- update to 0.2.8
+* adapt to new plugin interface
+
+-------------------------------------------------------------------
Old:
----
zathura-pdf-poppler-0.2.7.tar.gz
New:
----
zathura-pdf-poppler-0.2.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zathura-plugin-pdf-poppler.spec ++++++
--- /var/tmp/diff_new_pack.d0C37z/_old 2018-01-30 15:42:36.151650111 +0100
+++ /var/tmp/diff_new_pack.d0C37z/_new 2018-01-30 15:42:36.155649925 +0100
@@ -1,7 +1,7 @@
#
# spec file for package zathura-plugin-pdf-poppler
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,20 +18,20 @@
%define realname zathura-pdf-poppler
Name: zathura-plugin-pdf-poppler
-Version: 0.2.7
+Version: 0.2.8
Release: 0
Summary: PDF support for zathura via poppler
License: Zlib
Group: Productivity/Office/Other
Url: https://pwmt.org/projects/%{realname}/
Source: https://pwmt.org/projects/%{realname}/download/%{realname}-%{version}.tar.gz
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(girara-gtk3)
BuildRequires: pkgconfig(poppler-glib)
BuildRequires: pkgconfig(zathura)
Requires: zathura
Provides: zathura-pdf-poppler-plugin
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The zathura-pdf-poppler plugin adds PDF support to zathura by using the poppler rendering engine.
@@ -44,14 +44,13 @@
make %{?_smp_mflags} VERBOSE=1 SFLAGS=""
%install
-%make_install LIBDIR=%{_libdir} SFLAGs=""
+%make_install APPDATAPREFIX=%{_datadir}/appdata LIBDIR=%{_libdir} SFLAGs=""
find %{buildroot} -name '*.desktop' -delete -print
%post -n %{name} -p /sbin/ldconfig
%postun -n %{name} -p /sbin/ldconfig
%files -n %{name}
-%defattr(-,root,root)
%doc AUTHORS LICENSE
%dir %{_libdir}/zathura
%{_libdir}/zathura/pdf.so
++++++ zathura-pdf-poppler-0.2.7.tar.gz -> zathura-pdf-poppler-0.2.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/attachments.c new/zathura-pdf-poppler-0.2.8/attachments.c
--- old/zathura-pdf-poppler-0.2.7/attachments.c 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/attachments.c 2017-12-21 14:20:53.000000000 +0100
@@ -5,15 +5,16 @@
#include "plugin.h"
girara_list_t*
-pdf_document_attachments_get(zathura_document_t* document, PopplerDocument* poppler_document, zathura_error_t* error)
+pdf_document_attachments_get(zathura_document_t* document, void* data, zathura_error_t* error)
{
- if (document == NULL || poppler_document == NULL) {
+ if (document == NULL || data == NULL) {
if (error != NULL) {
*error = ZATHURA_ERROR_INVALID_ARGUMENTS;
}
return NULL;
}
+ PopplerDocument* poppler_document = data;
if (poppler_document_has_attachments(poppler_document) == FALSE) {
girara_warning("PDF file has no attachments");
if (error != NULL) {
@@ -22,8 +23,7 @@
return NULL;
}
- girara_list_t* res = girara_sorted_list_new2((girara_compare_function_t) g_strcmp0,
- (girara_free_function_t) g_free);
+ girara_list_t* res = girara_sorted_list_new2((girara_compare_function_t) g_strcmp0, g_free);
if (res == NULL) {
if (error != NULL) {
*error = ZATHURA_ERROR_OUT_OF_MEMORY;
@@ -42,12 +42,13 @@
zathura_error_t
pdf_document_attachment_save(zathura_document_t* document,
- PopplerDocument* poppler_document, const char* attachmentname, const char* file)
+ void* data, const char* attachmentname, const char* file)
{
- if (document == NULL || poppler_document == NULL) {
+ if (document == NULL || data == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
+ PopplerDocument* poppler_document = data;
if (poppler_document_has_attachments(poppler_document) == FALSE) {
girara_warning("PDF file has no attachments");
return ZATHURA_ERROR_INVALID_ARGUMENTS;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/config.mk new/zathura-pdf-poppler-0.2.8/config.mk
--- old/zathura-pdf-poppler-0.2.7/config.mk 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/config.mk 2017-12-21 14:20:53.000000000 +0100
@@ -2,7 +2,7 @@
VERSION_MAJOR = 0
VERSION_MINOR = 2
-VERSION_REV = 7
+VERSION_REV = 8
VERSION = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}
PKG_CONFIG ?= pkg-config
@@ -12,7 +12,7 @@
# zathura
ZATHURA_VERSION_CHECK ?= 1
-ZATHURA_MIN_VERSION = 0.2.0
+ZATHURA_MIN_VERSION = 0.3.8
ZATHURA_PKG_CONFIG_NAME = zathura
# poppler
@@ -24,7 +24,7 @@
PREFIX ?= /usr
LIBDIR ?= ${PREFIX}/lib
DESKTOPPREFIX ?= ${PREFIX}/share/applications
-APPDATAPREFIX ?= ${PREFIX}/share/appdata
+APPDATAPREFIX ?= ${PREFIX}/share/metainfo
# libs
CAIRO_INC ?= $(shell $(PKG_CONFIG) --cflags cairo)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/document.c new/zathura-pdf-poppler-0.2.8/document.c
--- old/zathura-pdf-poppler-0.2.7/document.c 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/document.c 2017-12-21 14:20:53.000000000 +0100
@@ -56,12 +56,13 @@
}
zathura_error_t
-pdf_document_free(zathura_document_t* document, PopplerDocument* poppler_document)
+pdf_document_free(zathura_document_t* document, void* data)
{
if (document == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
+ PopplerDocument* poppler_document = data;
if (poppler_document != NULL) {
g_object_unref(poppler_document);
zathura_document_set_data(document, NULL);
@@ -71,9 +72,9 @@
}
zathura_error_t
-pdf_document_save_as(zathura_document_t* document, PopplerDocument* poppler_document, const char* path)
+pdf_document_save_as(zathura_document_t* document, void* data, const char* path)
{
- if (document == NULL || poppler_document == NULL || path == NULL) {
+ if (document == NULL || data == NULL || path == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
@@ -83,7 +84,9 @@
return ZATHURA_ERROR_UNKNOWN;
}
- gboolean ret = poppler_document_save(poppler_document, file_uri, NULL);
+ PopplerDocument* poppler_document = data;
+
+ const gboolean ret = poppler_document_save(poppler_document, file_uri, NULL);
g_free(file_uri);
return (ret == TRUE ? ZATHURA_ERROR_OK : ZATHURA_ERROR_UNKNOWN);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/forms.c new/zathura-pdf-poppler-0.2.8/forms.c
--- old/zathura-pdf-poppler-0.2.7/forms.c 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/forms.c 2017-12-21 14:20:53.000000000 +0100
@@ -3,7 +3,7 @@
#include "plugin.h"
girara_list_t*
-pdf_page_form_fields_get(zathura_page_t* page, PopplerPage* poppler_page,
+pdf_page_form_fields_get(zathura_page_t* page, void* poppler_page,
zathura_error_t* error)
{
if (error != NULL) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/image.c new/zathura-pdf-poppler-0.2.8/image.c
--- old/zathura-pdf-poppler-0.2.7/image.c 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/image.c 2017-12-21 14:20:53.000000000 +0100
@@ -3,12 +3,12 @@
#include "plugin.h"
#include "utils.h"
-static void pdf_zathura_image_free(zathura_image_t* image);
+static void pdf_zathura_image_free(void* image);
girara_list_t*
-pdf_page_images_get(zathura_page_t* page, PopplerPage* poppler_page, zathura_error_t* error)
+pdf_page_images_get(zathura_page_t* page, void* data, zathura_error_t* error)
{
- if (page == NULL || poppler_page == NULL) {
+ if (page == NULL || data == NULL) {
if (error != NULL) {
*error = ZATHURA_ERROR_INVALID_ARGUMENTS;
}
@@ -18,6 +18,7 @@
girara_list_t* list = NULL;
GList* image_mapping = NULL;
+ PopplerPage* poppler_page = data;
image_mapping = poppler_page_get_image_mapping(poppler_page);
if (image_mapping == NULL || g_list_length(image_mapping) == 0) {
if (error != NULL) {
@@ -34,7 +35,7 @@
goto error_free;
}
- girara_list_set_free_function(list, (girara_free_function_t) pdf_zathura_image_free);
+ girara_list_set_free_function(list, pdf_zathura_image_free);
for (GList* image = image_mapping; image != NULL; image = g_list_next(image)) {
zathura_image_t* zathura_image = g_malloc0(sizeof(zathura_image_t));
@@ -76,10 +77,10 @@
}
cairo_surface_t*
-pdf_page_image_get_cairo(zathura_page_t* page, PopplerPage* poppler_page,
+pdf_page_image_get_cairo(zathura_page_t* page, void* data,
zathura_image_t* image, zathura_error_t* error)
{
- if (page == NULL || poppler_page == NULL || image == NULL || image->data == NULL) {
+ if (page == NULL || data == NULL || image == NULL || image->data == NULL) {
if (error != NULL) {
*error = ZATHURA_ERROR_INVALID_ARGUMENTS;
}
@@ -88,6 +89,7 @@
gint* image_id = (gint*) image->data;
+ PopplerPage* poppler_page = data;
cairo_surface_t* surface = poppler_page_get_image(poppler_page, *image_id);
if (surface == NULL) {
if (error != NULL) {
@@ -104,12 +106,13 @@
}
static void
-pdf_zathura_image_free(zathura_image_t* image)
+pdf_zathura_image_free(void* data)
{
- if (image == NULL) {
+ if (data == NULL) {
return;
}
+ zathura_image_t* image = data;
if (image->data != NULL) {
g_free(image->data);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/index.c new/zathura-pdf-poppler-0.2.8/index.c
--- old/zathura-pdf-poppler-0.2.7/index.c 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/index.c 2017-12-21 14:20:53.000000000 +0100
@@ -7,15 +7,16 @@
root, PopplerIndexIter* iter);
girara_tree_node_t*
-pdf_document_index_generate(zathura_document_t* document, PopplerDocument* poppler_document, zathura_error_t* error)
+pdf_document_index_generate(zathura_document_t* document, void* data, zathura_error_t* error)
{
- if (document == NULL || poppler_document == NULL) {
+ if (document == NULL || data == NULL) {
if (error != NULL) {
*error = ZATHURA_ERROR_INVALID_ARGUMENTS;
}
return NULL;
}
+ PopplerDocument* poppler_document = data;
PopplerIndexIter* iter = poppler_index_iter_new(poppler_document);
if (iter == NULL) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/links.c new/zathura-pdf-poppler-0.2.8/links.c
--- old/zathura-pdf-poppler-0.2.7/links.c 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/links.c 2017-12-21 14:20:53.000000000 +0100
@@ -4,17 +4,18 @@
#include "utils.h"
girara_list_t*
-pdf_page_links_get(zathura_page_t* page, PopplerPage* poppler_page, zathura_error_t* error)
+pdf_page_links_get(zathura_page_t* page, void* data, zathura_error_t* error)
{
- if (page == NULL || poppler_page == NULL) {
+ if (page == NULL || data == NULL) {
if (error != NULL) {
*error = ZATHURA_ERROR_INVALID_ARGUMENTS;
}
goto error_ret;
}
- girara_list_t* list = NULL;
- GList* link_mapping = NULL;
+ girara_list_t* list = NULL;
+ GList* link_mapping = NULL;
+ PopplerPage* poppler_page = data;
link_mapping = poppler_page_get_link_mapping(poppler_page);
if (link_mapping == NULL || g_list_length(link_mapping) == 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/meta.c new/zathura-pdf-poppler-0.2.8/meta.c
--- old/zathura-pdf-poppler-0.2.7/meta.c 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/meta.c 2017-12-21 14:20:53.000000000 +0100
@@ -7,17 +7,17 @@
#define LENGTH(x) (sizeof(x)/sizeof((x)[0]))
girara_list_t*
-pdf_document_get_information(zathura_document_t* document, PopplerDocument*
- poppler_document, zathura_error_t* error)
+pdf_document_get_information(zathura_document_t* document, void* data, zathura_error_t* error)
{
- if (document == NULL || poppler_document == NULL) {
+ if (document == NULL || data == NULL) {
if (error != NULL) {
*error = ZATHURA_ERROR_INVALID_ARGUMENTS;
}
return NULL;
}
- girara_list_t* list = zathura_document_information_entry_list_new();
+ PopplerDocument* poppler_document = data;
+ girara_list_t* list = zathura_document_information_entry_list_new();
if (list == NULL) {
return NULL;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/page.c new/zathura-pdf-poppler-0.2.8/page.c
--- old/zathura-pdf-poppler-0.2.7/page.c 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/page.c 2017-12-21 14:20:53.000000000 +0100
@@ -9,7 +9,7 @@
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
- zathura_document_t* document = zathura_page_get_document(page);
+ zathura_document_t* document = zathura_page_get_document(page);
PopplerDocument* poppler_document = zathura_document_get_data(document);
if (poppler_document == NULL) {
@@ -37,12 +37,13 @@
}
zathura_error_t
-pdf_page_clear(zathura_page_t* page, PopplerPage* poppler_page)
+pdf_page_clear(zathura_page_t* page, void* data)
{
if (page == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
+ PopplerPage* poppler_page = data;
if (poppler_page != NULL) {
g_object_unref(poppler_page);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/plugin.c new/zathura-pdf-poppler-0.2.8/plugin.c
--- old/zathura-pdf-poppler-0.2.7/plugin.c 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/plugin.c 2017-12-21 14:20:53.000000000 +0100
@@ -2,31 +2,27 @@
#include "plugin.h"
-void
-register_functions(zathura_plugin_functions_t* functions)
-{
- functions->document_open = (zathura_plugin_document_open_t) pdf_document_open;
- functions->document_free = (zathura_plugin_document_free_t) pdf_document_free;
- functions->document_index_generate = (zathura_plugin_document_index_generate_t) pdf_document_index_generate;
- functions->document_save_as = (zathura_plugin_document_save_as_t) pdf_document_save_as;
- functions->document_attachments_get = (zathura_plugin_document_attachments_get_t) pdf_document_attachments_get;
- functions->document_attachment_save = (zathura_plugin_document_attachment_save_t) pdf_document_attachment_save;
- functions->document_get_information = (zathura_plugin_document_get_information_t) pdf_document_get_information;
- functions->page_init = (zathura_plugin_page_init_t) pdf_page_init;
- functions->page_clear = (zathura_plugin_page_clear_t) pdf_page_clear;
- functions->page_search_text = (zathura_plugin_page_search_text_t) pdf_page_search_text;
- functions->page_links_get = (zathura_plugin_page_links_get_t) pdf_page_links_get;
- functions->page_form_fields_get = (zathura_plugin_page_form_fields_get_t) pdf_page_form_fields_get;
- functions->page_images_get = (zathura_plugin_page_images_get_t) pdf_page_images_get;
- functions->page_get_text = (zathura_plugin_page_get_text_t) pdf_page_get_text;
- functions->page_render_cairo = (zathura_plugin_page_render_cairo_t) pdf_page_render_cairo;
- functions->page_image_get_cairo = (zathura_plugin_page_image_get_cairo_t) pdf_page_image_get_cairo;
-}
-
-ZATHURA_PLUGIN_REGISTER(
+ZATHURA_PLUGIN_REGISTER_WITH_FUNCTIONS(
"pdf-poppler",
VERSION_MAJOR, VERSION_MINOR, VERSION_REV,
- register_functions,
+ ZATHURA_PLUGIN_FUNCTIONS({
+ .document_open = pdf_document_open,
+ .document_free = pdf_document_free,
+ .document_index_generate = pdf_document_index_generate,
+ .document_save_as = pdf_document_save_as,
+ .document_attachments_get = pdf_document_attachments_get,
+ .document_attachment_save = pdf_document_attachment_save,
+ .document_get_information = pdf_document_get_information,
+ .page_init = pdf_page_init,
+ .page_clear = pdf_page_clear,
+ .page_search_text = pdf_page_search_text,
+ .page_links_get = pdf_page_links_get,
+ .page_form_fields_get = pdf_page_form_fields_get,
+ .page_images_get = pdf_page_images_get,
+ .page_get_text = pdf_page_get_text,
+ .page_render_cairo = pdf_page_render_cairo,
+ .page_image_get_cairo = pdf_page_image_get_cairo
+ }),
ZATHURA_PLUGIN_MIMETYPES({
"application/pdf"
})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/plugin.h new/zathura-pdf-poppler-0.2.8/plugin.h
--- old/zathura-pdf-poppler-0.2.7/plugin.h 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/plugin.h 2017-12-21 14:20:53.000000000 +0100
@@ -8,6 +8,8 @@
#include <cairo.h>
+#include <girara/macros.h>
+
#include <zathura/page.h>
#include <zathura/document.h>
#include <zathura/plugin-api.h>
@@ -19,7 +21,7 @@
* @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
-zathura_error_t pdf_document_open(zathura_document_t* document);
+GIRARA_HIDDEN zathura_error_t pdf_document_open(zathura_document_t* document);
/**
* Closes and frees the internal document structure
@@ -28,7 +30,7 @@
* @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
-zathura_error_t pdf_document_free(zathura_document_t* document, PopplerDocument* poppler_document);
+GIRARA_HIDDEN zathura_error_t pdf_document_free(zathura_document_t* document, void* poppler_document);
/**
* Initializes the page with the needed values
@@ -37,7 +39,7 @@
* @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
-zathura_error_t pdf_page_init(zathura_page_t* page);
+GIRARA_HIDDEN zathura_error_t pdf_page_init(zathura_page_t* page);
/**
* Frees the data that is used by the plugin in the page
@@ -46,7 +48,7 @@
* @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
-zathura_error_t pdf_page_clear(zathura_page_t* page, PopplerPage* poppler_page);
+GIRARA_HIDDEN zathura_error_t pdf_page_clear(zathura_page_t* page, void* poppler_page);
/**
* Saves the document to the given path
@@ -56,8 +58,8 @@
* @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
-zathura_error_t pdf_document_save_as(zathura_document_t* document,
- PopplerDocument* poppler_document, const char* path);
+GIRARA_HIDDEN zathura_error_t pdf_document_save_as(zathura_document_t* document,
+ void* poppler_document, const char* path);
/**
* Generates the index of the document
@@ -68,8 +70,8 @@
* @return Tree node object or NULL if an error occurred (e.g.: the document has
* no index)
*/
-girara_tree_node_t* pdf_document_index_generate(zathura_document_t* document,
- PopplerDocument* poppler_document, zathura_error_t* error);
+GIRARA_HIDDEN girara_tree_node_t* pdf_document_index_generate(zathura_document_t* document,
+ void* poppler_document, zathura_error_t* error);
/**
* Returns a list of attachments included in the zathura document
@@ -79,8 +81,8 @@
* error occurred
* @return List of attachments or NULL if an error occurred
*/
-girara_list_t* pdf_document_attachments_get(zathura_document_t* document,
- PopplerDocument* poppler_document, zathura_error_t* error);
+GIRARA_HIDDEN girara_list_t* pdf_document_attachments_get(zathura_document_t* document,
+ void* poppler_document, zathura_error_t* error);
/**
* Saves an attachment to a file
@@ -91,8 +93,8 @@
* @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
-zathura_error_t pdf_document_attachment_save(zathura_document_t*
- document, PopplerDocument* poppler_document, const char* attachment, const char* filename);
+GIRARA_HIDDEN zathura_error_t pdf_document_attachment_save(zathura_document_t*
+ document, void* poppler_document, const char* attachment, const char* filename);
/**
* Returns a list of images included on the zathura page
@@ -102,8 +104,8 @@
* error occurred
* @return List of images
*/
-girara_list_t* pdf_page_images_get(zathura_page_t* page,
- PopplerPage* poppler_page, zathura_error_t* error);
+GIRARA_HIDDEN girara_list_t* pdf_page_images_get(zathura_page_t* page,
+ void* poppler_page, zathura_error_t* error);
/**
* Gets the content of the image in a cairo surface
@@ -114,8 +116,8 @@
* error occurred
* @return The cairo image surface or NULL if an error occurred
*/
-cairo_surface_t* pdf_page_image_get_cairo(zathura_page_t* page,
- PopplerPage* poppler_page, zathura_image_t* image, zathura_error_t* error);
+GIRARA_HIDDEN cairo_surface_t* pdf_page_image_get_cairo(zathura_page_t* page,
+ void* poppler_page, zathura_image_t* image, zathura_error_t* error);
/**
* Returns a list of document information entries of the document
@@ -125,8 +127,8 @@
* error occurred
* @return List of information entries or NULL if an error occurred
*/
-girara_list_t* pdf_document_get_information(zathura_document_t* document,
- PopplerDocument* poppler_document, zathura_error_t* error);
+GIRARA_HIDDEN girara_list_t* pdf_document_get_information(zathura_document_t* document,
+ void* poppler_document, zathura_error_t* error);
/**
* Searches for a specific text on a page and returns a list of results
@@ -137,7 +139,7 @@
* error occurred
* @return List of search results or NULL if an error occurred
*/
-girara_list_t* pdf_page_search_text(zathura_page_t* page, PopplerPage*
+GIRARA_HIDDEN girara_list_t* pdf_page_search_text(zathura_page_t* page, void*
data, const char* text, zathura_error_t* error);
/**
@@ -148,8 +150,8 @@
* error occurred
* @return List of links or NULL if an error occurred
*/
-girara_list_t* pdf_page_links_get(zathura_page_t* page,
- PopplerPage* poppler_page, zathura_error_t* error);
+GIRARA_HIDDEN girara_list_t* pdf_page_links_get(zathura_page_t* page,
+ void* poppler_page, zathura_error_t* error);
/**
* Returns a list of form fields available on the given page
@@ -159,8 +161,8 @@
* error occurred
* @return List of form fields or NULL if an error occurred
*/
-girara_list_t* pdf_page_form_fields_get(zathura_page_t* page,
- PopplerPage* poppler_page, zathura_error_t* error);
+GIRARA_HIDDEN girara_list_t* pdf_page_form_fields_get(zathura_page_t* page,
+ void* poppler_page, zathura_error_t* error);
/**
* Get text for selection
@@ -170,7 +172,7 @@
* occurred
* @return The selected text (needs to be deallocated with g_free)
*/
-char* pdf_page_get_text(zathura_page_t* page, PopplerPage* poppler_page,
+GIRARA_HIDDEN char* pdf_page_get_text(zathura_page_t* page, void* poppler_page,
zathura_rectangle_t rectangle, zathura_error_t* error);
/**
@@ -182,7 +184,7 @@
* @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
-zathura_error_t pdf_page_render_cairo(zathura_page_t* page, PopplerPage*
+GIRARA_HIDDEN zathura_error_t pdf_page_render_cairo(zathura_page_t* page, void*
poppler_page, cairo_t* cairo, bool printing);
#endif // PDF_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/render.c new/zathura-pdf-poppler-0.2.8/render.c
--- old/zathura-pdf-poppler-0.2.7/render.c 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/render.c 2017-12-21 14:20:53.000000000 +0100
@@ -3,13 +3,14 @@
#include "plugin.h"
zathura_error_t
-pdf_page_render_cairo(zathura_page_t* page, PopplerPage* poppler_page, cairo_t*
+pdf_page_render_cairo(zathura_page_t* page, void* data, cairo_t*
cairo, bool printing)
{
- if (page == NULL || poppler_page == NULL || cairo == NULL) {
+ if (page == NULL || data == NULL || cairo == NULL) {
return ZATHURA_ERROR_INVALID_ARGUMENTS;
}
+ PopplerPage* poppler_page = data;
if (printing == false) {
poppler_page_render(poppler_page, cairo);
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/search.c new/zathura-pdf-poppler-0.2.8/search.c
--- old/zathura-pdf-poppler-0.2.7/search.c 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/search.c 2017-12-21 14:20:53.000000000 +0100
@@ -5,18 +5,19 @@
#include "plugin.h"
girara_list_t*
-pdf_page_search_text(zathura_page_t* page, PopplerPage* poppler_page, const
+pdf_page_search_text(zathura_page_t* page, void* data, const
char* text, zathura_error_t* error)
{
- if (page == NULL || poppler_page == NULL || text == NULL || strlen(text) == 0) {
+ if (page == NULL || data == NULL || text == NULL || strlen(text) == 0) {
if (error != NULL) {
*error = ZATHURA_ERROR_INVALID_ARGUMENTS;
}
goto error_ret;
}
- GList* results = NULL;
- girara_list_t* list = NULL;
+ PopplerPage* poppler_page = data;
+ GList* results = NULL;
+ girara_list_t* list = NULL;
/* search text */
results = poppler_page_find_text(poppler_page, text);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/select.c new/zathura-pdf-poppler-0.2.8/select.c
--- old/zathura-pdf-poppler-0.2.7/select.c 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/select.c 2017-12-21 14:20:53.000000000 +0100
@@ -3,10 +3,10 @@
#include "plugin.h"
char*
-pdf_page_get_text(zathura_page_t* page, PopplerPage* poppler_page,
+pdf_page_get_text(zathura_page_t* page, void* data,
zathura_rectangle_t rectangle, zathura_error_t* error)
{
- if (page == NULL || poppler_page == NULL) {
+ if (page == NULL || data == NULL) {
if (error != NULL) {
*error = ZATHURA_ERROR_INVALID_ARGUMENTS;
}
@@ -19,6 +19,7 @@
.y1 = rectangle.y1,
.y2 = rectangle.y2
};
+ PopplerPage* poppler_page = data;
/* get selected text */
return poppler_page_get_selected_text(poppler_page, POPPLER_SELECTION_GLYPH, &rect);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-pdf-poppler-0.2.7/utils.h new/zathura-pdf-poppler-0.2.8/utils.h
--- old/zathura-pdf-poppler-0.2.7/utils.h 2017-01-11 22:30:07.000000000 +0100
+++ new/zathura-pdf-poppler-0.2.8/utils.h 2017-12-21 14:20:53.000000000 +0100
@@ -14,7 +14,7 @@
*
* @return Zathura link object
*/
-zathura_link_t* poppler_link_to_zathura_link(PopplerDocument* poppler_document,
+GIRARA_HIDDEN zathura_link_t* poppler_link_to_zathura_link(PopplerDocument* poppler_document,
PopplerAction* poppler_action, zathura_rectangle_t position);
#endif // UTILS_H
1
0
Hello community,
here is the log from the commit of package zathura-plugin-djvu for openSUSE:Factory checked in at 2018-01-30 15:42:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zathura-plugin-djvu (Old)
and /work/SRC/openSUSE:Factory/.zathura-plugin-djvu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zathura-plugin-djvu"
Tue Jan 30 15:42:32 2018 rev:3 rq:569896 version:0.2.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/zathura-plugin-djvu/zathura-plugin-djvu.changes 2016-02-24 14:26:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.zathura-plugin-djvu.new/zathura-plugin-djvu.changes 2018-01-30 15:42:32.847804353 +0100
@@ -1,0 +2,6 @@
+Fri Jan 26 14:32:25 UTC 2018 - mimi.vx(a)gmail.com
+
+- update to 0.2.6
+* adapt to new plugin interface
+
+-------------------------------------------------------------------
Old:
----
zathura-djvu-0.2.5.tar.gz
New:
----
zathura-djvu-0.2.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zathura-plugin-djvu.spec ++++++
--- /var/tmp/diff_new_pack.IwvBpN/_old 2018-01-30 15:42:33.395778770 +0100
+++ /var/tmp/diff_new_pack.IwvBpN/_new 2018-01-30 15:42:33.395778770 +0100
@@ -1,7 +1,7 @@
#
# spec file for package zathura-plugin-djvu
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,19 +18,19 @@
%define realname zathura-djvu
Name: zathura-plugin-djvu
-Version: 0.2.5
+Version: 0.2.6
Release: 0
Summary: Adds DjVu support to zathura by using the djvulibre library
License: Zlib
Group: Productivity/Office/Other
Url: http://pwmt.org/projects/zathura/plugins/zathura-djvu/
Source: http://pwmt.org/projects/zathura/plugins/download/%{realname}-%{version}.ta…
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(ddjvuapi)
BuildRequires: pkgconfig(girara-gtk3)
BuildRequires: pkgconfig(zathura)
Requires: zathura
Provides: zathura-djvu-plugin
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The zathura-djvu plugin adds DjVu support to zathura by using the djvulibre library.
@@ -47,11 +47,9 @@
find %{buildroot} -name '*.desktop' -delete -print
%post -n %{name} -p /sbin/ldconfig
-
%postun -n %{name} -p /sbin/ldconfig
%files -n %{name}
-%defattr(-,root,root)
%doc AUTHORS LICENSE
%dir %{_libdir}/zathura
%{_libdir}/zathura/djvu.so
++++++ zathura-djvu-0.2.5.tar.gz -> zathura-djvu-0.2.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.5/LICENSE new/zathura-djvu-0.2.6/LICENSE
--- old/zathura-djvu-0.2.5/LICENSE 2015-12-22 23:47:18.000000000 +0100
+++ new/zathura-djvu-0.2.6/LICENSE 2017-01-11 22:09:55.000000000 +0100
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 pwmt.org
+Copyright (c) 2010-2017 pwmt.org
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.5/Makefile new/zathura-djvu-0.2.6/Makefile
--- old/zathura-djvu-0.2.5/Makefile 2015-12-22 23:47:18.000000000 +0100
+++ new/zathura-djvu-0.2.6/Makefile 2017-01-11 22:09:55.000000000 +0100
@@ -5,8 +5,8 @@
PROJECT = zathura-djvu
PLUGIN = djvu
-SOURCE = $(shell find . -iname "*.c")
-HEADER = $(shell find . -iname "*.h")
+SOURCE = $(sort $(wildcard *.c))
+HEADER = $(sort $(wildcard *.h))
OBJECTS = ${SOURCE:.c=.o}
DOBJECTS = ${SOURCE:.c=.do}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.5/config.mk new/zathura-djvu-0.2.6/config.mk
--- old/zathura-djvu-0.2.5/config.mk 2015-12-22 23:47:18.000000000 +0100
+++ new/zathura-djvu-0.2.6/config.mk 2017-01-11 22:09:55.000000000 +0100
@@ -2,7 +2,7 @@
VERSION_MAJOR = 0
VERSION_MINOR = 2
-VERSION_REV = 5
+VERSION_REV = 6
VERSION = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}
# minimum required zathura version
@@ -43,6 +43,9 @@
# compiler flags
CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length -Wextra $(INCS)
+# linker flags
+LDFLAGS += -fPIC
+
# debug
DFLAGS ?= -g
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.5/djvu.h new/zathura-djvu-0.2.6/djvu.h
--- old/zathura-djvu-0.2.5/djvu.h 2015-12-22 23:47:18.000000000 +0100
+++ new/zathura-djvu-0.2.6/djvu.h 2017-01-11 22:09:55.000000000 +0100
@@ -24,7 +24,7 @@
* Open a DjVU document
*
* @param document Zathura document
- * @return ZATHURA_ERROR_OK when no error occured, otherwise see
+ * @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
zathura_error_t djvu_document_open(zathura_document_t* document);
@@ -33,7 +33,7 @@
* Closes and frees the internal document structure
*
* @param document Zathura document
- * @return ZATHURA_ERROR_OK when no error occured, otherwise see
+ * @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
zathura_error_t djvu_document_free(zathura_document_t* document, djvu_document_t* djvu_document);
@@ -43,7 +43,7 @@
*
* @param document Zathura document
* @param error Set to an error value (see zathura_error_t) if an
- * error occured
+ * error occurred
* @return Tree node object or NULL if an error occurred (e.g.: the document has
* no index)
*/
@@ -55,7 +55,7 @@
*
* @param document Zathura document
* @param path File path
- * @return ZATHURA_ERROR_OK when no error occured, otherwise see
+ * @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
zathura_error_t djvu_document_save_as(zathura_document_t* document, djvu_document_t* djvu_document, const char* path);
@@ -64,7 +64,7 @@
* Initializes the page
*
* @param page The page object
- * @return ZATHURA_ERROR_OK when no error occured, otherwise see
+ * @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
zathura_error_t djvu_page_init(zathura_page_t* page, void* data);
@@ -73,7 +73,7 @@
* Frees a DjVu page
*
* @param page Page
- * @return ZATHURA_ERROR_OK when no error occured, otherwise see
+ * @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
zathura_error_t djvu_page_clear(zathura_page_t* page, void* data);
@@ -84,7 +84,7 @@
* @param page Page
* @param text Search item
* @param error Set to an error value (see zathura_error_t) if an
- * error occured
+ * error occurred
* @return List of search results or NULL if an error occurred
*/
girara_list_t* djvu_page_search_text(zathura_page_t* page, void* data, const char* text, zathura_error_t* error);
@@ -95,7 +95,7 @@
* @param page Page
* @param rectangle Selection
* @error Set to an error value (see \ref zathura_error_t) if an error
- * occured
+ * occurred
* @return The selected text (needs to be deallocated with g_free)
*/
char* djvu_page_get_text(zathura_page_t* page, void* data, zathura_rectangle_t rectangle, zathura_error_t* error);
@@ -106,7 +106,7 @@
* @param page The page
* @param data Unused page data
* @param error Error code
- * @return List of links or NULL if an error occured
+ * @return List of links or NULL if an error occurred
*/
girara_list_t* djvu_page_links_get(zathura_page_t* page, void* data,
zathura_error_t* error);
@@ -117,7 +117,7 @@
*
* @param page Page
* @param error Set to an error value (see zathura_error_t) if an
- * error occured
+ * error occurred
* @return Image buffer or NULL if an error occurred
*/
zathura_image_buffer_t* djvu_page_render(zathura_page_t* page, void* data, zathura_error_t* error);
@@ -129,7 +129,7 @@
* @param page Page
* @param cairo Cairo object
* @param printing Set to true if page should be rendered for printing
- * @return ZATHURA_ERROR_OK when no error occured, otherwise see
+ * @return ZATHURA_ERROR_OK when no error occurred, otherwise see
* zathura_error_t
*/
zathura_error_t djvu_page_render_cairo(zathura_page_t* page, void* data, cairo_t* cairo, bool printing);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zathura-djvu-0.2.5/page-text.h new/zathura-djvu-0.2.6/page-text.h
--- old/zathura-djvu-0.2.5/page-text.h 2015-12-22 23:47:18.000000000 +0100
+++ new/zathura-djvu-0.2.6/page-text.h 2017-01-11 22:09:55.000000000 +0100
@@ -31,7 +31,7 @@
*
* @param document The document
* @param page_number The number of the page
- * @return The page object or NULL if an error occured
+ * @return The page object or NULL if an error occurred
*/
GIRARA_HIDDEN djvu_page_text_t* djvu_page_text_new(djvu_document_t* document,
zathura_page_t* page);
@@ -44,11 +44,11 @@
GIRARA_HIDDEN void djvu_page_text_free(djvu_page_text_t* page_text);
/**
- * Searchs the page for a specific key word and returns a list of results
+ * Searches the page for a specific key word and returns a list of results
*
* @param page_text The djvu page text object
* @param text The text to search
- * @return List of results or NULL if an error occured
+ * @return List of results or NULL if an error occurred
*/
GIRARA_HIDDEN girara_list_t* djvu_page_text_search(djvu_page_text_t* page_text,
const char* text);
@@ -58,7 +58,7 @@
*
* @param page_text The djvu page text object
* @param rectangle The area of where the text should be copied
- * @return Copy of the text or NULL if an error occured or if the area is empty
+ * @return Copy of the text or NULL if an error occurred or if the area is empty
*/
GIRARA_HIDDEN char* djvu_page_text_select(djvu_page_text_t* page_text,
zathura_rectangle_t rectangle);
1
0
Hello community,
here is the log from the commit of package zathura for openSUSE:Factory checked in at 2018-01-30 15:42:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zathura (Old)
and /work/SRC/openSUSE:Factory/.zathura.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zathura"
Tue Jan 30 15:42:27 2018 rev:8 rq:569894 version:0.3.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/zathura/zathura.changes 2017-02-09 11:15:32.587686384 +0100
+++ /work/SRC/openSUSE:Factory/.zathura.new/zathura.changes 2018-01-30 15:42:31.299876619 +0100
@@ -1,0 +2,7 @@
+Fri Jan 26 14:13:33 UTC 2018 - mimi.vx(a)gmail.com
+
+- update to 0.3.8
+* Fix memory leaks
+* Rework plugin initialization
+
+-------------------------------------------------------------------
Old:
----
zathura-0.3.7.tar.gz
New:
----
zathura-0.3.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zathura.spec ++++++
--- /var/tmp/diff_new_pack.wErPF6/_old 2018-01-30 15:42:31.883849356 +0100
+++ /var/tmp/diff_new_pack.wErPF6/_new 2018-01-30 15:42:31.883849356 +0100
@@ -1,7 +1,7 @@
#
# spec file for package zathura
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX 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: zathura
-Version: 0.3.7
+Version: 0.3.8
Release: 0
Summary: A highly customizable document viewer
License: Zlib
@@ -25,30 +25,28 @@
Url: http://pwmt.org/projects/zathura/
Source: http://pwmt.org/projects/zathura/download/%{name}-%{version}.tar.gz
BuildRequires: file-devel
-BuildRequires: pkg-config
-BuildRequires: pkgconfig(girara-gtk3) >= 0.2.4
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(girara-gtk3) >= 0.2.8
BuildRequires: pkgconfig(sqlite3)
-%if 0%{?suse_version} >= 1330
-BuildRequires: pkgconfig(synctex)
-%endif
-Requires(post): update-desktop-files
-Requires(postun): update-desktop-files
Recommends: %{name}-lang
Recommends: zathura-pdf-poppler-plugin
Suggests: zathura-cb-plugin
Suggests: zathura-djvu-plugin
Suggests: zathura-ps-plugin
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} >= 1330
+BuildRequires: pkgconfig(synctex)
+%endif
%description
zathura is a highly customizable and functional document viewer. It provides
a minimalistic and space saving interface as well as an easy usage that mainly
focuses on keyboard interaction.
+
%package devel
Summary: Development files for zathura
Group: Development/Libraries/GNOME
-Requires: %{name} == %{version}
+Requires: %{name} = %{version}
%description devel
Development and Header files for package zathura
@@ -64,33 +62,24 @@
make WITH_SQLITE=1 %{?_smp_mflags} COLOR=0 VERBOSE=1 SFLAGS=""
%install
-%make_install LIBDIR=%{_libdir} COLOR=0 SFLAGS=""
+%make_install LIBDIR=%{_libdir} APPDATAPREFIX=%{_datadir}/appdata COLOR=0 SFLAGS=""
%find_lang %{name} %{?no_lang_C}
-%post
-%desktop_database_post
-
-%postun
-%desktop_database_postun
-
%files
-%defattr(-,root,root)
%doc README LICENSE AUTHORS
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%dir %{_datadir}/appdata
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/dbus-1/interfaces/org.pwmt.%{name}.xml
-%{_mandir}/man1/%{name}.1.*
-%{_mandir}/man5/%{name}rc.5.*
+%{_mandir}/man1/%{name}.1%{ext_man}
+%{_mandir}/man5/%{name}rc.5%{ext_man}
%files devel
-%defattr (-,root,root,-)
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*.h
%{_libdir}/pkgconfig/%{name}.pc
%files lang -f %{name}.lang
-%defattr(-,root,root)
%changelog
++++++ zathura-0.3.7.tar.gz -> zathura-0.3.8.tar.gz ++++++
++++ 14600 lines of diff (skipped)
1
0