<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/64824e63e4b23df8496b740af910263a884e62d0">https://github.com/macports/macports-ports/commit/64824e63e4b23df8496b740af910263a884e62d0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 64824e63e4b rawstudio: update to 20210603, fix the broken port
</span>64824e63e4b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 64824e63e4b23df8496b740af910263a884e62d0
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Tue Aug 23 22:52:10 2022 +0800
<span style='display:block; white-space:pre;color:#404040;'> rawstudio: update to 20210603, fix the broken port
</span>---
graphics/rawstudio/Portfile | 94 ++++++++++++++++++----
.../rawstudio/files/patch-DARWIN_C_SOURCE.diff | 12 +++
graphics/rawstudio/files/patch-rawstudio.h.diff | 65 +++++++++++++++
3 files changed, 156 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawstudio/Portfile b/graphics/rawstudio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a63d4394c65..816ef25ff14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/rawstudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawstudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name rawstudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup rawstudio rawstudio c140a5eb64901e07db5190db20f9884e86e5dcae
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20210603
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics
license GPL-2+
maintainers nomaintainer
homepage http://rawstudio.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}/files/release/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> description Raw-image converter.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Rawstudio is a modern raw-image converter and organizer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with many features. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Rawstudio is a modern raw-image converter and organizer with many features. \
</span> * Reads all dcraw supported formats \
* Internal 16bit rgb \
* Various post-shot controls (white balance, saturation \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,11 +21,73 @@ long_description Rawstudio is a modern raw-image converter and organizer \
</span> * Realtime histogram \
* Easy sorting of images \
* Fullscreen mode for better overview
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 25399cd80294fa44220a8940fc77689f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 9ce96c40e0b8feaf4627c14310646782578d4da1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 035d80c9da44a7928d240f0b06473e8cd3efcebd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.redirect_bins rawstudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Rawstudio uses an external submodule Rawspeed which is missing in a tarball.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/rawstudio/rawstudio/tree/master/plugins/load-rawspeed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/klauspost/rawspeed/tree/fa23d1c2f71c01cc085b80a2a6f8b633edd2626b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fetch.type git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "git submodule update --init"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-DARWIN_C_SOURCE.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-rawstudio.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gcc-4.2 fails to build Rawspeed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Apple clangs fail to build it too, at least very recent ones.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *gcc-4.* {clang} {macports-clang-1[5-9]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/dbus-1.pc:dbus \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3-single \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flickcurl \
</span> port:gconf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lcms \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:exiv2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lcms2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lensfun \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgphoto2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:exiv2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This way it works:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rs-curve.c: error: non-void function 'rs_curve_widget_draw' should return a value [-Wreturn-type]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-c++11-narrowing \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-return-type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} == 10 && ${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not use Xcode clang for ppc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not use Intel instructions on Rosetta.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CAN_COMPILE_SSE2=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CAN_COMPILE_SSE4_1=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CAN_COMPILE_AVX=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --build=powerpc-apple-darwin${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawstudio/files/patch-DARWIN_C_SOURCE.diff b/graphics/rawstudio/files/patch-DARWIN_C_SOURCE.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..100f3a0f985
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawstudio/files/patch-DARWIN_C_SOURCE.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- librawstudio/rs-utils.c.orig 2021-06-03 05:43:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ librawstudio/rs-utils.c 2022-08-25 04:07:21.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _XOPEN_SOURCE 500 /* strptime() and realpath() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <rawstudio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawstudio/files/patch-rawstudio.h.diff b/graphics/rawstudio/files/patch-rawstudio.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ecb9fa68312
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawstudio/files/patch-rawstudio.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,65 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- librawstudio/rawstudio.h.orig 2021-06-03 05:43:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ librawstudio/rawstudio.h 2023-06-09 06:18:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,10 +23,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "rs-types.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "rs-macros.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "rs-debug.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,8 +74,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "x86-cpu.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} /* extern "c" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* RAWSTUDIO_H */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- librawstudio/rs-macros.h.orig 2021-06-03 05:43:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ librawstudio/rs-macros.h 2023-06-09 06:26:30.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,12 +51,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __GNUC__ >= 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define likely(x) __builtin_expect (!!(x), 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define unlikely(x) __builtin_expect (!!(x), 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define align(x) __attribute__ ((aligned (x)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __deprecated __attribute__ ((deprecated))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define likely(x) (x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define unlikely(x) (x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define align(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __deprecated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/rs-tag-gui.c.orig 2023-06-09 07:20:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/rs-tag-gui.c 2023-06-09 07:20:46.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,11 +90,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return box;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GtkWidget *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-rs_library_tag_entry_new(RSLibrary *library)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_assert(RS_IS_LIBRARY(library));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ selected(GtkEntryCompletion *completion, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,6 +171,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return found;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GtkWidget *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rs_library_tag_entry_new(RSLibrary *library)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_assert(RS_IS_LIBRARY(library));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GtkWidget *entry = gtk_entry_new();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GtkEntryCompletion *completion = gtk_entry_completion_new();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GtkListStore *store = gtk_list_store_new(1, G_TYPE_STRING);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>