svn commit: r567316 - in head: . graphics graphics/rawstudio graphics/rawstudio/files

Alexey Dokuchaev danfe at FreeBSD.org
Thu Mar 4 14:46:57 UTC 2021 

Author: danfe
Date: Thu Mar  4 14:46:55 2021
New Revision: 567316
URL: https://svnweb.freebsd.org/changeset/ports/567316

Log:
  - Revivify and unbreak by fixing problematic code and
    suppressing dreaded C++11 narrowing warnings/errors
  - Convert to USES+=localbase and optimize away LIBS+=
  - Remove excessive vertical whitespace from one patch
  - Chase HTTP redirection in the WWW line of pkg-descr

Added:
  head/graphics/rawstudio/
     - copied from r501105, head/graphics/rawstudio/
  head/graphics/rawstudio/files/patch-exiv2   (contents, props changed)
Modified:
  head/MOVED
  head/graphics/Makefile
  head/graphics/rawstudio/Makefile
  head/graphics/rawstudio/files/patch-plugins_load-dcraw_dcraw.cc
  head/graphics/rawstudio/files/patch-rs-tag-gui.c
  head/graphics/rawstudio/pkg-descr

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Mar  4 14:43:09 2021	(r567315)
+++ head/MOVED	Thu Mar  4 14:46:55 2021	(r567316)
@@ -12657,7 +12657,6 @@ games/voxelands-server||2019-05-09|Has expired: Broken
 games/warsow||2019-05-09|Has expired: Broken for more than 6 months
 graphics/apvlv||2019-05-09|Has expired: Broken for more than 6 months
 graphics/qslim||2019-05-09|Has expired: Broken for more than 6 months
-graphics/rawstudio||2019-05-09|Has expired: Broken for more than 6 months
 graphics/tulip||2019-05-09|Has expired: Broken for more than 6 months
 lang/qore||2019-05-09|Has expired: Broken for more than 6 months
 math/goblin||2019-05-09|Has expired: Broken for more than 6 months

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Thu Mar  4 14:43:09 2021	(r567315)
+++ head/graphics/Makefile	Thu Mar  4 14:46:55 2021	(r567316)
@@ -931,6 +931,7 @@
     SUBDIR += radius-engine
     SUBDIR += rapid-photo-downloader
     SUBDIR += raster3d
+    SUBDIR += rawstudio
     SUBDIR += rawtherapee
     SUBDIR += rayshade
     SUBDIR += reactphysics3d

Modified: head/graphics/rawstudio/Makefile
==============================================================================
--- head/graphics/rawstudio/Makefile	Thu May  9 15:02:19 2019	(r501105)
+++ head/graphics/rawstudio/Makefile	Thu Mar  4 14:46:55 2021	(r567316)
@@ -12,10 +12,6 @@ COMMENT=	Open-source program to read and manipulate RA
 
 LICENSE=	GPLv2
 
-BROKEN=		fails to build
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2019-05-08
-
 LIB_DEPENDS=	libpng.so:graphics/png \
 		liblcms.so:graphics/lcms \
 		libexiv2.so:graphics/exiv2 \
@@ -28,19 +24,18 @@ BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 
 BROKEN_powerpc64=	fails to link: libicuuc.so. undefined reference to __cxa_throw_bad_array_new_length
 
-USES=		desktop-file-utils gettext gmake jpeg libtool pathfix pkgconfig \
-		sqlite
+USES=		compiler:c++11-lang desktop-file-utils gettext gmake \
+		gnome jpeg libtool localbase pathfix pkgconfig sqlite
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 libxml2 gconf2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-LIBS+=		`pkg-config --libs gthread-2.0`
+CXXFLAGS+=	-Wno-c++11-narrowing
 
 post-patch:
-	@${REINPLACE_CMD} -e 's, libssl,,' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/^pkg_modules=/s,libssl,gthread-2.0,' \
+		${WRKSRC}/configure
 # lensfun 0.3.0 had removed support for LF_MODIFY_CCI
 	@${REINPLACE_CMD} -e 's, | LF_MODIFY_CCI,,' \
 		${WRKSRC}/plugins/lensfun/lensfun.c

Added: head/graphics/rawstudio/files/patch-exiv2
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/rawstudio/files/patch-exiv2	Thu Mar  4 14:46:55 2021	(r567316)
@@ -0,0 +1,33 @@
+--- librawstudio/rs-exif.cc.orig
++++ librawstudio/rs-exif.cc
+@@ -21,6 +21,8 @@
+ #include <iomanip>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/error.hpp>
++#include <exiv2/version.hpp>
+ #include "rs-exif.h"
+ #include <assert.h>
+ #include "rs-library.h"
+--- plugins/load-gdk/exiv2-colorspace.cpp.orig
++++ plugins/load-gdk/exiv2-colorspace.cpp
+@@ -22,6 +22,8 @@
+ #include <iomanip>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/version.hpp>
++#include <exiv2/error.hpp>
+ #include <assert.h>
+ #include "exiv2-colorspace.h"
+ #include <math.h>
+--- plugins/meta-exiv2/exiv2-metadata.cpp.orig
++++ plugins/meta-exiv2/exiv2-metadata.cpp
+@@ -22,6 +22,8 @@
+ #include <iomanip>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/version.hpp>
++#include <exiv2/error.hpp>
+ #include <assert.h>
+ #include "exiv2-metadata.h"
+ #include <math.h>

Modified: head/graphics/rawstudio/files/patch-plugins_load-dcraw_dcraw.cc
==============================================================================
--- head/graphics/rawstudio/files/patch-plugins_load-dcraw_dcraw.cc	Thu May  9 15:02:19 2019	(r501105)
+++ head/graphics/rawstudio/files/patch-plugins_load-dcraw_dcraw.cc	Thu Mar  4 14:46:55 2021	(r567316)
@@ -10,3 +10,12 @@
    uchar data[0x10000];
    const uchar *dp;
  
+@@ -8605,7 +8606,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full)
+   strncpy (th->desc, desc, 512);
+   strncpy (th->make, make, 64);
+   strncpy (th->model, model, 64);
+-  strcpy (th->soft, "dcraw v"DCRAW_VERSION);
++  strcpy (th->soft, "dcraw v" DCRAW_VERSION);
+   t = gmtime (&timestamp);
+   sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
+       t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);

Modified: head/graphics/rawstudio/files/patch-rs-tag-gui.c
==============================================================================
--- head/graphics/rawstudio/files/patch-rs-tag-gui.c	Thu May  9 15:02:19 2019	(r501105)
+++ head/graphics/rawstudio/files/patch-rs-tag-gui.c	Thu Mar  4 14:46:55 2021	(r567316)
@@ -12,16 +12,14 @@
  	gboolean
  	selected(GtkEntryCompletion *completion, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
  	{
-@@ -179,6 +174,13 @@
+@@ -179,6 +174,11 @@
  		return found;
  	}
  
-+
 +GtkWidget *
 +rs_library_tag_entry_new(RSLibrary *library)
 +{
 +	g_assert(RS_IS_LIBRARY(library));
-+
 +
  	GtkWidget *entry = gtk_entry_new();
  	GtkEntryCompletion *completion = gtk_entry_completion_new();

Modified: head/graphics/rawstudio/pkg-descr
==============================================================================
--- head/graphics/rawstudio/pkg-descr	Thu May  9 15:02:19 2019	(r501105)
+++ head/graphics/rawstudio/pkg-descr	Thu Mar  4 14:46:55 2021	(r567316)
@@ -9,4 +9,4 @@ use an image editing application to further work on yo
 itself is a highly specialized application for reviewing and processing RAW
 images, not a fully featured image editing application.
 
-WWW: http://rawstudio.org/
+WWW: https://rawstudio.org/

More information about the svn-ports-head mailing list