[arch-commits] Commit in pdftricks/trunk (5 files)

Balló György bgyorgy at archlinux.org
Thu Aug 29 23:03:54 UTC 2019


    Date: Thursday, August 29, 2019 @ 23:03:54
  Author: bgyorgy
Revision: 505092

upgpkg: pdftricks 0.2.7-1

Update to new version

Modified:
  pdftricks/trunk/PKGBUILD
Deleted:
  pdftricks/trunk/0001-Fix-build-with-vala-0.44.patch
  pdftricks/trunk/0001-Fix-message-dialog-about-ImageMagick-Policies.patch
  pdftricks/trunk/0001-Fix-non-ascii-error.patch
  pdftricks/trunk/0001-Remove-incompatible-option.patch

----------------------------------------------------------+
 0001-Fix-build-with-vala-0.44.patch                      |   25 -----
 0001-Fix-message-dialog-about-ImageMagick-Policies.patch |   36 -------
 0001-Fix-non-ascii-error.patch                           |   62 -------------
 0001-Remove-incompatible-option.patch                    |   25 -----
 PKGBUILD                                                 |   26 -----
 5 files changed, 3 insertions(+), 171 deletions(-)

Deleted: 0001-Fix-build-with-vala-0.44.patch
===================================================================
--- 0001-Fix-build-with-vala-0.44.patch	2019-08-29 23:02:22 UTC (rev 505091)
+++ 0001-Fix-build-with-vala-0.44.patch	2019-08-29 23:03:54 UTC (rev 505092)
@@ -1,25 +0,0 @@
-From 431c3891898a1696c6b497c633ee8d0a404a9d5d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Thu, 20 Jun 2019 20:44:15 +0200
-Subject: [PATCH] Fix build with vala 0.44
-
----
- src/Widgets/MergePDF.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Widgets/MergePDF.vala b/src/Widgets/MergePDF.vala
-index 389b0a9..0777ef8 100644
---- a/src/Widgets/MergePDF.vala
-+++ b/src/Widgets/MergePDF.vala
-@@ -59,7 +59,7 @@ namespace pdftricks {
-             view = new Gtk.TreeView.with_model (list_store);
-             view.hexpand = true;
-             view.vexpand = true;
--            view.enable_model_drag_source( Gdk.BUTTON1_MASK,
-+            view.enable_model_drag_source(Gdk.ModifierType.BUTTON1_MASK,
-                                                 targets,
-                                                 Gdk.DragAction.MOVE);
-             view.enable_model_drag_dest(targets,
--- 
-2.22.0
-

Deleted: 0001-Fix-message-dialog-about-ImageMagick-Policies.patch
===================================================================
--- 0001-Fix-message-dialog-about-ImageMagick-Policies.patch	2019-08-29 23:02:22 UTC (rev 505091)
+++ 0001-Fix-message-dialog-about-ImageMagick-Policies.patch	2019-08-29 23:03:54 UTC (rev 505092)
@@ -1,36 +0,0 @@
-From 5fdc432976ea725f880645cca7fce023eeab54af Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Thu, 20 Jun 2019 20:49:11 +0200
-Subject: [PATCH] Fix message dialog about ImageMagick Policies
-
----
- src/Widgets/MergePDF.vala | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/Widgets/MergePDF.vala b/src/Widgets/MergePDF.vala
-index 389b0a9..9437ddc 100644
---- a/src/Widgets/MergePDF.vala
-+++ b/src/Widgets/MergePDF.vala
-@@ -241,6 +241,10 @@ namespace pdftricks {
-                 var file_pdf = (string) cell1;
-                 if(!file_pdf.contains(".pdf")){
-                     file_pdf = convert_to_pdf(file_pdf);
-+                    if (file_pdf == ""){
-+                        files_pdf = "";
-+                        return true;
-+                    }
-                 }
-                 files_pdf = files_pdf + " " + file_pdf.replace(" ", "\\ ");
-                 return false;
-@@ -283,7 +287,7 @@ namespace pdftricks {
-                 if(output.contains("Error")){
-                     return "";
-                 }
--                if(stderr.contains("not authorized")){
-+                if(stderr.contains("not allowed")){
-                     var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (_("ImageMagick Policies"), _("Change the ImageMagick security policies that prevent this operation and try again."), "process-stop", Gtk.ButtonsType.CLOSE);
-                     message_dialog.set_transient_for(window);
-                     message_dialog.show_all ();
--- 
-2.22.0
-

Deleted: 0001-Fix-non-ascii-error.patch
===================================================================
--- 0001-Fix-non-ascii-error.patch	2019-08-29 23:02:22 UTC (rev 505091)
+++ 0001-Fix-non-ascii-error.patch	2019-08-29 23:03:54 UTC (rev 505092)
@@ -1,62 +0,0 @@
-From 2529e99be12029e2a2959e35691a128b894f2cff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Thu, 20 Jun 2019 22:27:10 +0200
-Subject: [PATCH] Fix non-ascii error
-
-Completion of fix in 83ccc49ae89b4710bb811f4656bd84bff0103191
----
- src/Widgets/SplitPDF.vala | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/Widgets/SplitPDF.vala b/src/Widgets/SplitPDF.vala
-index f5512ab..646d1d7 100644
---- a/src/Widgets/SplitPDF.vala
-+++ b/src/Widgets/SplitPDF.vala
-@@ -114,7 +114,7 @@ namespace pdftricks {
-                 if(btn_range.get_active() == true){
-                     model_thumbs.clear();
-                     type_split = "range";
--                    var file_pdf = filechooser.get_uri().split(":")[1].replace("///", "/").replace("%20", " ");
-+                    var file_pdf = filechooser.get_filename();
-                     view_thumbs.set_columns(page_size);
-                     if(create_thumbs(file_pdf)){
-                         for (int a = 1; a <= page_size; a++) {
-@@ -154,7 +154,7 @@ namespace pdftricks {
-             split_button.set_sensitive(false);
- 
-             filechooser.file_set.connect(() => {
--                var file_pdf = filechooser.get_uri().split(":")[1].replace("///", "/").replace("%20", " ");
-+                var file_pdf = filechooser.get_filename();
-                 page_size = get_page_count(file_pdf);
-                 split_button.set_sensitive (true);
-                 btn_all.set_sensitive (true);
-@@ -231,7 +231,7 @@ namespace pdftricks {
-             var split = false;
- 
- 
--            var file_pdf = filechooser.get_uri().split(":")[1].replace("///", "/").replace("%20", " ");
-+            var file_pdf = filechooser.get_filename();
-             var output_file = "";
-             Gtk.FileChooserNative chooser_output = new Gtk.FileChooserNative (
-                 _("Select the file to compress"), window, Gtk.FileChooserAction.SAVE,
-@@ -242,7 +242,7 @@ namespace pdftricks {
-             chooser_output.set_current_name(filename);
-             chooser_output.do_overwrite_confirmation = false;
-             if (chooser_output.run () == Gtk.ResponseType.ACCEPT) {
--                output_file = chooser_output.get_uri().split(":")[1].replace("///", "/").replace("%20", "\\ ");
-+                output_file = chooser_output.get_filename().replace(" ", "\\ ");
-                 split = true;
-             }
-             chooser_output.destroy();
-@@ -388,7 +388,7 @@ namespace pdftricks {
-             int exit_status = 0;
-             int result = 0;
-             try{
--                var cmd = "gs -q -dNODISPLAY -c \"(" + input_file + ") (r) file runpdfbegin pdfpagecount = quit\"";
-+                var cmd = "gs -q -dNODISPLAY -c \"(" + input_file.replace(" ", "\\ ") + ") (r) file runpdfbegin pdfpagecount = quit\"";
-                 Process.spawn_command_line_sync (cmd, out output, out stderr, out exit_status);
-                 result = int.parse(output);
-             } catch (Error e) {
--- 
-2.22.0
-

Deleted: 0001-Remove-incompatible-option.patch
===================================================================
--- 0001-Remove-incompatible-option.patch	2019-08-29 23:02:22 UTC (rev 505091)
+++ 0001-Remove-incompatible-option.patch	2019-08-29 23:03:54 UTC (rev 505092)
@@ -1,25 +0,0 @@
-From c9c11a574fa6c10b8beb11fb87b90a6f86e006bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Thu, 20 Jun 2019 22:30:43 +0200
-Subject: [PATCH] Remove incompatible option
-
----
- src/Widgets/SplitPDF.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Widgets/SplitPDF.vala b/src/Widgets/SplitPDF.vala
-index f5512ab..64893fc 100644
---- a/src/Widgets/SplitPDF.vala
-+++ b/src/Widgets/SplitPDF.vala
-@@ -369,7 +369,7 @@ namespace pdftricks {
-             int exit_status = 0;
-             string output_filename = output_file.replace(".pdf", "_" + label + ".pdf");
-             try{
--                var cmd = "gs -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dNOPAUSE -dQUIET -dBATCH -dAutoFilterColorImages=false -dEncodeColorImages=true -dColorImageFilter=/DCTEncode -dColorConversionStrategy=/LeaveColorUnchange -dFirstPage=" + page_start.to_string() + " -dLastPage=" + page_end.to_string() + " -sOutputFile=" + output_filename +" " + input.replace(" ", "\\ ");
-+                var cmd = "gs -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dNOPAUSE -dQUIET -dBATCH -dAutoFilterColorImages=false -dEncodeColorImages=true -dColorImageFilter=/DCTEncode -dFirstPage=" + page_start.to_string() + " -dLastPage=" + page_end.to_string() + " -sOutputFile=" + output_filename +" " + input.replace(" ", "\\ ");
-                 Process.spawn_command_line_sync (cmd, out output, out stderr, out exit_status);
-             } catch (Error e) {
-                 critical (e.message);
--- 
-2.22.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-29 23:02:22 UTC (rev 505091)
+++ PKGBUILD	2019-08-29 23:03:54 UTC (rev 505092)
@@ -1,7 +1,7 @@
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=pdftricks
-pkgver=0.2.5
+pkgver=0.2.7
 pkgrel=1
 pkgdesc="Simple, efficient application for small manipulations in PDF files using Ghostscript"
 arch=(x86_64)
@@ -9,32 +9,12 @@
 license=(GPL3)
 depends=(ghostscript granite imagemagick)
 makedepends=(meson vala)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/muriloventuroso/$pkgname/archive/$pkgver.tar.gz"
-        0001-Fix-build-with-vala-0.44.patch
-        0001-Fix-message-dialog-about-ImageMagick-Policies.patch
-        0001-Fix-non-ascii-error.patch
-        0001-Remove-incompatible-option.patch)
-sha256sums=('8b97061c82a85e17025c43948b04221cca12929c51d6c7f4f6b25bebec2aa939'
-            '00f8bba01f73aba6b1903db735bfce9ad6124f92376cbd089a4499df7909e158'
-            'edf96e59bf1a4a7d53d669ab5cf2727f8aa73246f70d6b342e061e18565067e2'
-            '977de8d12760ca942877c7f67e99d05afe13b80b3d0b5bd532b66651fb64175e'
-            '4a1643e639a30de9a5dabb61b9e3c5f1dc34277802ee32feb5bbe0ab0a2479ec')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/muriloventuroso/$pkgname/archive/$pkgver.tar.gz")
+sha256sums=('501fafa0405e6e96560c2db3e43b4edb875129d74b9b20363af8d2b12a13e8cd')
 
 prepare() {
   cd $pkgname-$pkgver
 
-  # https://github.com/muriloventuroso/pdftricks/pull/31
-  patch -Np1 -i ../0001-Fix-build-with-vala-0.44.patch
-
-  # https://github.com/muriloventuroso/pdftricks/pull/32
-  patch -Np1 -i ../0001-Fix-message-dialog-about-ImageMagick-Policies.patch
-
-  # https://github.com/muriloventuroso/pdftricks/pull/33
-  patch -Np1 -i ../0001-Fix-non-ascii-error.patch
-
-  # https://github.com/muriloventuroso/pdftricks/pull/34
-  patch -Np1 -i ../0001-Remove-incompatible-option.patch
-
   # Use standard icon name
   sed -i 's/process-completed/gtk-apply/' src/Widgets/*.vala
 }



More information about the arch-commits mailing list