Update to 5.7

scx · Sep 21, 2019 · 62b13b1 · 62b13b1
1 parent e59e050
commit 62b13b1
Show file tree

Hide file tree

Showing 2 changed files with 113 additions and 59 deletions.
diff --git a/RawTherapee-5.6-xdg.patch → RawTherapee-5.7-xdg.patch b/RawTherapee-5.6-xdg.patch → RawTherapee-5.7-xdg.patch
@@ -1,7 +1,62 @@
-diff -Naur RawTherapee-5.6.orig/com.rawtherapee.RawTherapee.appdata.xml RawTherapee-5.6/com.rawtherapee.RawTherapee.appdata.xml
---- RawTherapee-5.6.orig/com.rawtherapee.RawTherapee.appdata.xml	2019-04-20 21:56:55.000000000 +0200
-+++ RawTherapee-5.6/com.rawtherapee.RawTherapee.appdata.xml	2019-09-20 00:42:25.408459436 +0200
-@@ -8,36 +8,23 @@
+From e33bee7ceab5e5f8bfbd01c3d26c60f463cc0088 Mon Sep 17 00:00:00 2001
+From: scx <[email protected]>
+Date: Thu, 19 Sep 2019 23:40:49 +0200
+Subject: [PATCH 1/4] Update desktop file
+
+ - Update Version entry (Keyword key was introduced in 1.1)
+ - Fix GenericName
+ - Add TryExec entry
+ - Update Keywords
+---
+ rtdata/rawtherapee.desktop.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/rtdata/rawtherapee.desktop.in b/rtdata/rawtherapee.desktop.in
+index 233a737b6..9356c5a2d 100644
+--- a/rtdata/rawtherapee.desktop.in
++++ b/rtdata/rawtherapee.desktop.in
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Type=Application
+-Version=1.0
++Version=1.1
+ Name=RawTherapee
+-GenericName=Raw photo editor
++GenericName=Raw Photo Editor
+ GenericName[cs]=Editor raw obrázků
+ GenericName[fr]=Éditeur d'images raw
+ GenericName[pl]=Edytor zdjęć raw
+@@ -11,9 +11,10 @@ Comment[cs]=Program pro konverzi a zpracování digitálních raw fotografií
+ Comment[fr]=Logiciel de conversion et de traitement de photos numériques de format raw (but de capteur)
+ Comment[pl]=Zaawansowany program do wywoływania zdjęć typu raw
+ Icon=rawtherapee
++TryExec=rawtherapee
+ Exec=rawtherapee %f
+ Terminal=false
+ MimeType=image/jpeg;image/png;image/tiff;image/x-adobe-dng;image/x-canon-cr2;image/x-canon-crf;image/x-canon-crw;image/x-fuji-raf;image/x-hasselblad-3fr;image/x-hasselblad-fff;image/x-jpg;image/x-kodak-dcr;image/x-kodak-k25;image/x-kodak-kdc;image/x-leaf-mos;image/x-leica-rwl;image/x-mamiya-mef;image/x-minolta-mrw;image/x-nikon-nef;image/x-nikon-nrw;image/x-olympus-orf;image/x-panasonic-raw;image/x-panasonic-rw2;image/x-pentax-pef;image/x-pentax-raw;image/x-phaseone-iiq;image/x-raw;image/x-rwz;image/x-samsung-srw;image/x-sigma-x3f;image/x-sony-arq;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-tif;
+ Categories=Photography;Graphics;2DGraphics;RasterGraphics;GTK;
+-Keywords=raw;photography;develop;pp3;graphics;
++Keywords=raw;photo;photography;develop;pp3;graphics;
+ StartupWMClass=rawtherapee
+
+From 633eab24c288b2a8933af23b88d057f7df2ed0f3 Mon Sep 17 00:00:00 2001
+From: scx <[email protected]>
+Date: Thu, 19 Sep 2019 23:44:17 +0200
+Subject: [PATCH 2/4] Update AppData file
+
+ - Fix description (<p> tag)
+ - Remove keywords (should be obtained from desktop file)
+ - Fix URLs
+ - Fix screenshot caption (too long)
+---
+ com.rawtherapee.RawTherapee.appdata.xml | 28 +++++++------------------
+ 1 file changed, 7 insertions(+), 21 deletions(-)
+
+diff --git a/com.rawtherapee.RawTherapee.appdata.xml b/com.rawtherapee.RawTherapee.appdata.xml
+index 0e5dfef50..564821cb4 100644
+--- a/com.rawtherapee.RawTherapee.appdata.xml
++++ b/com.rawtherapee.RawTherapee.appdata.xml
+@@ -8,31 +8,17 @@
      <summary xml:lang="pl">Zaawansowany program do wywoływania zdjęć typu raw</summary>
      <translation type="gettext">rawtherapee</translation>
      <description>
@@ -26,73 +81,74 @@ diff -Naur RawTherapee-5.6.orig/com.rawtherapee.RawTherapee.appdata.xml RawThera
 -        <keyword>pp3</keyword>
 -        <keyword>graphics</keyword>
 -    </keywords>
-+    <content_rating type="oars-1.0" />
+     <content_rating type="oars-1.0" />
      <metadata_license>CC-BY-SA-4.0</metadata_license>
      <project_license>GPL-3.0+</project_license>
 -    <url type="bugtracker">https://github.com/Beep6581/RawTherapee/issues/new</url>
 +    <url type="bugtracker">https://github.com/Beep6581/RawTherapee/issues</url>
      <url type="donation">https://www.paypal.me/rawtherapee</url>
--    <url type="help">http://rawpedia.rawtherapee.com/</url>
--    <url type="homepage">http://rawtherapee.com/</url>
+-    <url type="help">https://rawpedia.rawtherapee.com/</url>
+-    <url type="homepage">https://www.rawtherapee.com/</url>
 +    <url type="help">https://rawpedia.rawtherapee.com</url>
 +    <url type="homepage">https://www.rawtherapee.com</url>
      <url type="translate">https://discuss.pixls.us/t/localization-how-to-translate-rawtherapee-and-rawpedia/2594</url>
      <launchable type="desktop-id">rawtherapee.desktop</launchable>
      <releases>
-         <release version="5.6" date="2019-04-20" type="stable"></release>
--        <release version="5.6-rc2" date="2019-04-17" type="development"></release>
--        <release version="5.6-rc1" date="2019-04-10" type="development"></release>
-+        <release version="5.6~rc2" date="2019-04-17" type="development"></release>
-+        <release version="5.6~rc1" date="2019-04-10" type="development"></release>
-         <release version="5.5" date="2018-12-17" type="stable"></release>
-     </releases>
-     <provides>
-@@ -45,17 +32,17 @@
-         <binary>rawtherapee-cli</binary>
+@@ -48,7 +34,7 @@
      </provides>
      <screenshots>
--        <screenshot type="default">
-+        <screenshot>
-             <caption>HDR DNG of a misty morning in the countryside</caption>
--            <image width="1920" height="1080">http://rawtherapee.com/images/screenshots/rt540_1.jpg</image>
-+            <image width="1920" height="1080">https://rawtherapee.com/images/screenshots/rt540_1.jpg</image>
-         </screenshot>
-         <screenshot>
-             <caption>Straight-out-of-camera vs RawTherapee</caption>
--            <image width="1920" height="1080">http://rawtherapee.com/images/screenshots/rt540_2.jpg</image>
-+            <image width="1920" height="1080">https://rawtherapee.com/images/screenshots/rt540_2.jpg</image>
+         <screenshot type="default">
+-            <caption>Color-correcting a drosera rotundifolia in RawTherapee 5.7.</caption>
++            <caption>Color-correcting a drosera rotundifolia</caption>
+             <image width="1920" height="1080">https://rawtherapee.com/images/screenshots/rt570_1.jpg</image>
          </screenshot>
          <screenshot>
-             <caption>RawTherapee using the Auto-Matched Tone Curve tool</caption>
--            <image width="1920" height="1080">http://rawtherapee.com/images/screenshots/rt540_3.jpg</image>
-+            <image width="1920" height="1080">https://rawtherapee.com/images/screenshots/rt540_3.jpg</image>
-         </screenshot>
-     </screenshots>
-     <update_contact>[email protected]</update_contact>
-diff -Naur RawTherapee-5.6.orig/rtdata/rawtherapee.desktop.in RawTherapee-5.6/rtdata/rawtherapee.desktop.in
---- RawTherapee-5.6.orig/rtdata/rawtherapee.desktop.in	2019-04-20 21:56:55.000000000 +0200
-+++ RawTherapee-5.6/rtdata/rawtherapee.desktop.in	2019-09-20 00:41:47.933065525 +0200
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Type=Application
--Version=1.0
-+Version=1.1
- Name=RawTherapee
--GenericName=Raw photo editor
-+GenericName=Raw Photo Editor
- GenericName[cs]=Editor raw obrázků
- GenericName[fr]=Éditeur d'images raw
- GenericName[pl]=Edytor zdjęć raw
-@@ -11,9 +11,10 @@
- Comment[fr]=Logiciel de conversion et de traitement de photos numériques de format raw (but de capteur)
- Comment[pl]=Zaawansowany program do wywoływania zdjęć typu raw
- Icon=rawtherapee
-+TryExec=rawtherapee
+
+From 2415511b7011434b6f088fb46df8f4737b9e717b Mon Sep 17 00:00:00 2001
+From: scx <[email protected]>
+Date: Thu, 19 Sep 2019 23:55:31 +0200
+Subject: [PATCH 3/4] Update desktop file
+
+ - Change order of categories (Main Category before Additional Categories)
+---
+ rtdata/rawtherapee.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rtdata/rawtherapee.desktop.in b/rtdata/rawtherapee.desktop.in
+index 9356c5a2d..c6c675c4d 100644
+--- a/rtdata/rawtherapee.desktop.in
++++ b/rtdata/rawtherapee.desktop.in
+@@ -15,6 +15,6 @@ TryExec=rawtherapee
  Exec=rawtherapee %f
  Terminal=false
  MimeType=image/jpeg;image/png;image/tiff;image/x-adobe-dng;image/x-canon-cr2;image/x-canon-crf;image/x-canon-crw;image/x-fuji-raf;image/x-hasselblad-3fr;image/x-hasselblad-fff;image/x-jpg;image/x-kodak-dcr;image/x-kodak-k25;image/x-kodak-kdc;image/x-leaf-mos;image/x-leica-rwl;image/x-mamiya-mef;image/x-minolta-mrw;image/x-nikon-nef;image/x-nikon-nrw;image/x-olympus-orf;image/x-panasonic-raw;image/x-panasonic-rw2;image/x-pentax-pef;image/x-pentax-raw;image/x-phaseone-iiq;image/x-raw;image/x-rwz;image/x-samsung-srw;image/x-sigma-x3f;image/x-sony-arq;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-tif;
 -Categories=Photography;Graphics;2DGraphics;RasterGraphics;GTK;
--Keywords=raw;photography;develop;pp3;graphics;
 +Categories=Graphics;Photography;2DGraphics;RasterGraphics;GTK;
-+Keywords=raw;photo;photography;develop;pp3;graphics;
+ Keywords=raw;photo;photography;develop;pp3;graphics;
  StartupWMClass=rawtherapee
+
+From 581e46c7b053b69ebc488011f43e7290870fa287 Mon Sep 17 00:00:00 2001
+From: scx <[email protected]>
+Date: Thu, 19 Sep 2019 23:59:00 +0200
+Subject: [PATCH 4/4] Fix AppData file
+
+ - Remove unreachable screenshot URL
+---
+ com.rawtherapee.RawTherapee.appdata.xml | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/com.rawtherapee.RawTherapee.appdata.xml b/com.rawtherapee.RawTherapee.appdata.xml
+index 564821cb4..41a669532 100644
+--- a/com.rawtherapee.RawTherapee.appdata.xml
++++ b/com.rawtherapee.RawTherapee.appdata.xml
+@@ -33,10 +33,6 @@
+         <binary>rawtherapee-cli</binary>
+     </provides>
+     <screenshots>
+-        <screenshot type="default">
+-            <caption>Color-correcting a drosera rotundifolia</caption>
+-            <image width="1920" height="1080">https://rawtherapee.com/images/screenshots/rt570_1.jpg</image>
+-        </screenshot>
+         <screenshot>
+             <caption>HDR DNG of a misty morning in the countryside</caption>
+             <image width="1920" height="1080">https://rawtherapee.com/images/screenshots/rt540_1.jpg</image>
diff --git a/RawTherapee.yaml b/RawTherapee.yaml
@@ -5,13 +5,11 @@ config-opts:
   - -DCMAKE_BUILD_TYPE=RelWithDebInfo
 sources:
   - type: archive
-    url: https://github.com/Beep6581/RawTherapee/archive/5.6.tar.gz
-    sha256: bd1d1a8cee698dc8a4129c5f671ba507511ac3cdfe8346c5cf76fc7dc286dcfd
-  # https://github.com/Beep6581/RawTherapee/pull/5304
-  # https://github.com/Beep6581/RawTherapee/commit/ef722d37cbd6a64eef1279cf9c7b3b0988100d1c#diff-ff2bf1aeefe12aeab6da2531ed8d9127
+    url: https://github.com/Beep6581/RawTherapee/releases/download/5.7/rawtherapee-5.7.tar.xz
+    sha256: dbd7c7cf7488fb97c520821eee2c745291637644b391e3ec0ed3a29701f1a9c7
   # https://github.com/Beep6581/RawTherapee/pull/5460
   - type: patch
-    path: RawTherapee-5.6-xdg.patch
+    path: RawTherapee-5.7-xdg.patch
 post-install:
   - xmlstarlet ed --inplace -d "/component/provides/binary[text()='rawtherapee-cli']" "${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.appdata.xml";
   - install -p -D -m 0644 "../LICENSE.txt" -t "${FLATPAK_DEST}/share/licenses/rawtherapee/";