commit xviewer for openSUSE:Factory

30 Apr 2018

Hello community,

here is the log from the commit of package xviewer for openSUSE:Factory checked in at 2018-04-30 22:56:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xviewer (Old)
 and      /work/SRC/openSUSE:Factory/.xviewer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xviewer"

Mon Apr 30 22:56:43 2018 rev:14 rq:602306 version:1.8.0

Changes:
--------

--- /work/SRC/openSUSE:Factory/xviewer/xviewer.changes	2018-03-28 10:28:39.982904000 +0200
+++ /work/SRC/openSUSE:Factory/.xviewer.new/xviewer.changes	2018-04-30 22:58:59.948328765 +0200
@@ -1,0 +2,9 @@
+Sat Apr 28 20:12:30 UTC 2018 - sor.alexei@meowr.ru
+
+- Update to version 1.8.0:
+  * EogListStore: Use the CHANGES_DONE_HINT to detect file changes.
+  * build: Use cinnamon-desktop instead of gnome-desktop.
+  * Fix build with gnome-desktop-3.28 development.
+- Remove xviewer-use-cinnamon-desktop.patch: fixed upstream.
+
+-------------------------------------------------------------------

Old:
----
  xviewer-1.6.1.tar.gz
  xviewer-use-cinnamon-desktop.patch

New:
----
  xviewer-1.8.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xviewer.spec ++++++
--- /var/tmp/diff_new_pack.fmBOV3/_old	2018-04-30 22:59:00.704301179 +0200
+++ /var/tmp/diff_new_pack.fmBOV3/_new	2018-04-30 22:59:00.708301034 +0200
@@ -17,15 +17,13 @@
 
 
 Name:           xviewer
-Version:        1.6.1
+Version:        1.8.0
 Release:        0
 Summary:        Fast and functional graphics viewer
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Productivity/Graphics/Viewers
 Url:            https://github.com/linuxmint/xviewer
 Source:         https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM xviewer-use-cinnamon-desktop.patch -- Use cinnamon-desktop instead of gnome-desktop.
-Patch0:         xviewer-use-cinnamon-desktop.patch
 BuildRequires:  fdupes
 BuildRequires:  gnome-common
 BuildRequires:  hicolor-icon-theme
@@ -39,7 +37,7 @@
 BuildRequires:  pkgconfig(exempi-2.0)
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10.0
+BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gtk+-unix-print-3.0)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libexif)
@@ -72,7 +70,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 NOCONFIGURE=1 gnome-autogen.sh
@@ -104,11 +101,7 @@
 %endif
 
 %files
-%if 0%{?suse_version} >= 1500
 %license COPYING
-%else
-%doc COPYING
-%endif
 %doc AUTHORS README
 %{_bindir}/%{name}
 %{_libdir}/%{name}/

++++++ xviewer-1.6.1.tar.gz -> xviewer-1.8.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-1.6.1/.circleci/config.yml new/xviewer-1.8.0/.circleci/config.yml
--- old/xviewer-1.6.1/.circleci/config.yml	1970-01-01 01:00:00.000000000 +0100
+++ new/xviewer-1.8.0/.circleci/config.yml	2018-04-26 20:01:53.000000000 +0200
@@ -0,0 +1,70 @@
+version: 2.0
+
+shared: &shared
+
+    steps:
+
+        - checkout
+
+        - run:
+            name: Prepare environment
+            command: apt-get update
+
+        - run:
+            name: Install dependencies
+            command: |
+                wget https://github.com/linuxmint/xapps/releases/download/master.${CIRCLE_JOB}/packages.tar.gz -O xapps.tar.gz
+                ls *.tar.gz | xargs -i tar zxvf {}
+                apt install --yes --allow-downgrades ./packages/*.deb
+                rm -rf packages
+
+        - run:
+            name: Build project
+            command: mint-build -i
+
+        - run:
+            name: Prepare packages
+            command: |
+                if [ -z $CI_PULL_REQUEST ]; then
+                    mkdir /packages
+                    mv /root/*.deb /packages/
+                    git log > /packages/git.log
+                    cd /
+                    tar zcvf packages.tar.gz packages
+                fi
+
+        - run:
+            name: Deploy packages to Github
+            command: |
+                if [ -z $CI_PULL_REQUEST ]; then
+                    wget https://github.com/tcnksm/ghr/releases/download/v0.5.4/ghr_v0.5.4_linux_amd6...
+                    apt-get install --yes unzip
+                    unzip ghr_v0.5.4_linux_amd64.zip
+                    TAG="master".$CIRCLE_JOB
+                    ./ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME -replace $TAG /packages.tar.gz
+                    ./ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME -recreate -b "Latest unstable packages" $TAG /packages.tar.gz
+                fi
+
+jobs:
+    "mint18":
+        <<: *shared
+        docker:
+            - image: linuxmintd/mint18-amd64
+
+    "mint19":
+        <<: *shared
+        docker:
+            - image: linuxmintd/mint19-amd64
+
+    "lmde3":
+        <<: *shared
+        docker:
+            - image: linuxmintd/lmde3-amd64
+
+workflows:
+    version: 2
+    build:
+        jobs:
+            - "mint18"
+            - "mint19"
+            - "lmde3"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-1.6.1/configure.ac new/xviewer-1.8.0/configure.ac
--- old/xviewer-1.6.1/configure.ac	2017-11-23 13:35:27.000000000 +0100
+++ new/xviewer-1.8.0/configure.ac	2018-04-26 20:01:53.000000000 +0200
@@ -1,8 +1,8 @@
 AC_PREREQ(2.59)
 
 m4_define(xviewer_major_version,  1)
-m4_define(xviewer_minor_version, 6)
-m4_define(xviewer_micro_version,  1)
+m4_define(xviewer_minor_version, 8)
+m4_define(xviewer_micro_version,  0)
 m4_define(xviewer_version, xviewer_major_version.xviewer_minor_version.xviewer_micro_version)
 
 AC_INIT([xviewer], xviewer_version, [https://github.com/linuxmint/xviewer/issues], [xviewer])
@@ -87,12 +87,11 @@
 
 GTK_REQUIRED=3.10.0
 GLIB_REQUIRED=2.38.0
-GNOME_DESKTOP_REQUIRED=2.91.2
+CINNAMON_DESKTOP_REQUIRED=3.2.0
 GDKPIXBUF_REQUIRED=2.4.0
 GTK_PRINT_REQUIRED=3.5.4
 SHARED_MIME_INFO_REQUIRED=0.20
 EXEMPI_REQUIRED=1.99.5
-DESKTOP_SCHEMAS_REQUIRED=2.91.92
 LIBPEAS_REQUIRED=0.7.4
 LIBPEAS_GTK_REQUIRED=0.7.4
 
@@ -100,11 +99,10 @@
              glib-2.0 >= $GLIB_REQUIRED \
              gio-2.0 >= $GLIB_REQUIRED \
              gio-unix-2.0 >= $GLIB_REQUIRED \
-             gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED \
+             cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED \
              gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED \
              gtk+-unix-print-3.0 >= $GTK_PRINT_REQUIRED \
              shared-mime-info >= $SHARED_MIME_INFO_REQUIRED \
-             gsettings-desktop-schemas >= $DESKTOP_SCHEMAS_REQUIRED \
              libpeas-1.0 >= $LIBPEAS_REQUIRED \
              libpeas-gtk-1.0 >= $LIBPEAS_GTK_REQUIRED"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-1.6.1/debian/changelog new/xviewer-1.8.0/debian/changelog
--- old/xviewer-1.6.1/debian/changelog	2017-11-23 13:35:27.000000000 +0100
+++ new/xviewer-1.8.0/debian/changelog	2018-04-26 20:01:53.000000000 +0200
@@ -1,3 +1,17 @@
+xviewer (1.8.0) tara; urgency=medium
+
+  [ Clement Lefebvre ]
+  * Add CI configuration
+  * EogListStore: Use the CHANGES_DONE_HINT to detect file changes
+
+  [ Michael Webster ]
+  * build: Use cinnamon-desktop instead of gnome-desktop.
+
+  [ Leigh Scott ]
+  * Fix build with gnome-desktop-3.28 development (#57)
+
+ -- Clement Lefebvre <root@linuxmint.com>  Thu, 26 Apr 2018 19:01:19 +0100
+
 xviewer (1.6.1) sylvia; urgency=medium
 
   * l10n: Update translations
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-1.6.1/debian/control new/xviewer-1.8.0/debian/control
--- old/xviewer-1.6.1/debian/control	2017-11-23 13:35:27.000000000 +0100
+++ new/xviewer-1.8.0/debian/control	2018-04-26 20:01:53.000000000 +0200
@@ -15,9 +15,8 @@
                libgtk-3-dev,
                libgdk-pixbuf2.0-dev (>= 2.19.1),
                libglib2.0-dev (>= 2.38.0),
-               libgnome-desktop-3-dev (>= 2.91.2),
+               libcinnamon-desktop-dev (>=3.2.0),
                shared-mime-info (>= 0.20),
-               gsettings-desktop-schemas-dev (>= 2.91.92),
                libpeas-dev (>= 0.7.4),
                yelp-tools,
                zlib1g-dev,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-1.6.1/src/xviewer-file-chooser.c new/xviewer-1.8.0/src/xviewer-file-chooser.c
--- old/xviewer-1.6.1/src/xviewer-file-chooser.c	2017-11-23 13:35:27.000000000 +0100
+++ new/xviewer-1.8.0/src/xviewer-file-chooser.c	2018-04-26 20:01:53.000000000 +0200
@@ -33,7 +33,7 @@
 #ifndef GNOME_DESKTOP_USE_UNSTABLE_API
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #endif
-#include <libgnome-desktop/gnome-desktop-thumbnail.h>
+#include <libcinnamon-desktop/gnome-desktop-thumbnail.h>
 
 static char *last_dir[] = { NULL, NULL, NULL, NULL };
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-1.6.1/src/xviewer-list-store.c new/xviewer-1.8.0/src/xviewer-list-store.c
--- old/xviewer-1.6.1/src/xviewer-list-store.c	2017-11-23 13:35:27.000000000 +0100
+++ new/xviewer-1.8.0/src/xviewer-list-store.c	2018-04-26 20:01:53.000000000 +0200
@@ -381,7 +381,7 @@
 	XviewerImage *image;
 
 	switch (event) {
-	case G_FILE_MONITOR_EVENT_CHANGED:
+	case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
 		file_info = g_file_query_info (file,
 					       G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
 					       0, NULL, NULL);
@@ -449,7 +449,6 @@
 		}
 		g_object_unref (file_info);
 		break;
-	case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
 	case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
 	case G_FILE_MONITOR_EVENT_UNMOUNTED:
 	case G_FILE_MONITOR_EVENT_MOVED:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-1.6.1/src/xviewer-thumbnail.c new/xviewer-1.8.0/src/xviewer-thumbnail.c
--- old/xviewer-1.6.1/src/xviewer-thumbnail.c	2017-11-23 13:35:27.000000000 +0100
+++ new/xviewer-1.8.0/src/xviewer-thumbnail.c	2018-04-26 20:01:53.000000000 +0200
@@ -31,7 +31,7 @@
 #ifndef GNOME_DESKTOP_USE_UNSTABLE_API
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #endif
-#include <libgnome-desktop/gnome-desktop-thumbnail.h>
+#include <libcinnamon-desktop/gnome-desktop-thumbnail.h>
 
 #include "xviewer-thumbnail.h"
 #include "xviewer-list-store.h"
@@ -122,10 +122,16 @@
 	height = gdk_pixbuf_get_height (pixbuf);
 
 	perc = CLAMP (128.0/(MAX (width, height)), 0, 1);
-
+#if GDK_PIXBUF_CHECK_VERSION(2,36,5)
+	thumb = gdk_pixbuf_scale_simple (pixbuf,
+							   width*perc,
+							   height*perc,
+							   GDK_INTERP_HYPER);
+#else
 	thumb = gnome_desktop_thumbnail_scale_down_pixbuf (pixbuf,
 							   width*perc,
 							   height*perc);
+#endif
 
 	return thumb;
 }
@@ -444,7 +450,11 @@
 		width  = MAX (width  * factor, 1);
 		height = MAX (height * factor, 1);
 
+#if GDK_PIXBUF_CHECK_VERSION(2,36,5)
+		result_pixbuf = gdk_pixbuf_scale_simple (thumbnail, width, height, GDK_INTERP_HYPER);
+#else
 		result_pixbuf = gnome_desktop_thumbnail_scale_down_pixbuf (thumbnail, width, height);
+#endif
 
 		return result_pixbuf;
 	}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-1.6.1/src/xviewer-thumbnail.h new/xviewer-1.8.0/src/xviewer-thumbnail.h
--- old/xviewer-1.6.1/src/xviewer-thumbnail.h	2017-11-23 13:35:27.000000000 +0100
+++ new/xviewer-1.8.0/src/xviewer-thumbnail.h	2018-04-26 20:01:53.000000000 +0200
@@ -28,6 +28,12 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "xviewer-image.h"
 
+#define GDK_PIXBUF_CHECK_VERSION(major, minor, micro) \
+	(GDK_PIXBUF_MAJOR > (major) || \
+	(GDK_PIXBUF_MAJOR == (major) && GDK_PIXBUF_MINOR > (minor)) || \
+	(GDK_PIXBUF_MAJOR == (major) && GDK_PIXBUF_MINOR == (minor) && \
+	 GDK_PIXBUF_MICRO >= (micro)))
+
 G_BEGIN_DECLS
 
 void          xviewer_thumbnail_init        (void);

    

root＠hilbert.suse.de

tags

participants (1)