[packages/fotoxx] - updated to 23.82 (last release under this name)

qboosh qboosh at pld-linux.org
Wed Oct 8 18:53:33 CEST 2025 

commit 17fd1d804967d29f760a948a75414967fd092072
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 8 18:56:47 2025 +0200

    - updated to 23.82 (last release under this name)

 fotoxx-Makefile.patch | 54 +++++++++++-------------------
 fotoxx-desktop.patch  | 14 --------
 fotoxx.spec           | 93 +++++++++++++++++++++++----------------------------
 3 files changed, 61 insertions(+), 100 deletions(-)
---
diff --git a/fotoxx.spec b/fotoxx.spec
index 050508f..8f6f334 100644
--- a/fotoxx.spec
+++ b/fotoxx.spec
@@ -1,26 +1,29 @@
 Summary:	Image procesor
 Summary(pl.UTF-8):	Procesor grafiki
 Name:		fotoxx
-Version:	11.04
-Release:	2
+Version:	23.82
+Release:	1
 License:	GPL v3
-Group:		Applications
-Source0:	http://kornelix.squarespace.com/storage/downloads/%{name}-%{version}.tar.gz
-# Source0-md5:	535f78b5000ee117b2c91c1bee94145e
+Group:		X11/Applications/Graphics
+Source0:	http://distcache.freebsd.org/ports-distfiles/%{name}-%{version}-source.tar.gz
+# Source0-md5:	7edf44377500d9597100e3c2d328bfa0
 Patch0:		%{name}-Makefile.patch
-Patch1:		%{name}-desktop.patch
-URL:		http://kornelix.squarespace.com/fotoxx
-BuildRequires:	FreeImage-devel
-BuildRequires:	gtk+2-devel
+URL:		http://kornelix.net/fotoxx.html
+BuildRequires:	clutter-devel >= 1.0
+BuildRequires:	clutter-gtk-devel >= 1.0
+BuildRequires:	gtk+3-devel >= 3.0
+BuildRequires:	lcms2-devel >= 2
+BuildRequires:	libchamplain-devel >= 0.12
+BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	perl-Image-ExifTool
+BuildRequires:	libtiff-devel
 BuildRequires:	pkgconfig
-BuildRequires:	ufraw
 BuildRequires:	xdg-utils
 Suggests:	perl-Image-ExifTool
 Suggests:	ufraw
 Suggests:	xdg-utils
-Obsoletes:	fotox
+Obsoletes:	fotox < 43
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -28,66 +31,52 @@ Fotoxx is a free open-source Linux program for improving image files
 made with a digital camera.
 
 Appart from standard operations it allows to:
-  - generate thumbnails
-  - fix red-eyes
-  - fix perspective
-  - make panoramas and HDR images
+- generate thumbnails
+- fix red-eyes
+- fix perspective
+- make panoramas and HDR images
 
 %description -l pl.UTF-8
 Fotoxxm to wolne oprogramowanie open-source umożliwiające manipulacje
 grafiką.
 
 Oprócz standardowej obróbki zdjęć, umożliwia min.:
-  - generowanie miniaturek
-  - usuwanie efektu czerwonych oczu
-  - tworzenie zdjęć panoramicznych
-  - generowanie zdjęć HDR
+- generowanie miniaturek
+- usuwanie efektu czerwonych oczu
+- tworzenie zdjęć panoramicznych
+- generowanie zdjęć HDR
 
 %prep
-%setup -q
-#%%patch0 -p1
-#%%patch1 -p1
+%setup -q -n %{name}
+%patch -P0 -p1
 
 %build
+CXXFLAGS="%{rpmcxxflags}" \
+CPPFLAGS="%{rpmcppflags}" \
+LDFLAGS="%{rpmldflags}" \
 %{__make} \
-	CXX="%{__cxx}" \
-	OPTCFLAGS="%{rpmcflags}" \
-	OPTLDFLAGS="%{rpmldflags}" \
-	DOCDIR=%{_docdir}/%{name}-%{version} \
-	PREFIX=%{_prefix}
+	CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_desktopdir}
-
-install -d $RPM_BUILD_ROOT%{_mandir}/man1/
-cp desktop $RPM_BUILD_ROOT%{_desktopdir}/kornelix-%{name}.desktop
-cp doc/%{name}.man $RPM_BUILD_ROOT%{_mandir}/man1/fotoxx.1
 
 %{__make} install \
-	PREFIX=%{_prefix} \
-	DOCDIR=%{_docdir}/%{name}-%{version} \
-	DESKTOP=$RPM_BUILD_ROOT%{_desktopdir}/kornelix-%{name}.desktop \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/fotoxx
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/{CHANGES,README,TRANSLATIONS,userguide-en.html}
-#%lang(es) %doc doc/userguide-es.html
-#%lang(fr) %doc doc/userguide-fr.html
-#%lang(gl) %doc doc/userguide-gl.html
-%attr(755,root,root) %{_bindir}/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/icons
-%dir %{_datadir}/%{name}/locales
-%lang(de) %{_datadir}/%{name}/locales/de
-%lang(es) %{_datadir}/%{name}/locales/es
-%lang(fr) %{_datadir}/%{name}/locales/fr
-%lang(gl) %{_datadir}/%{name}/locales/gl
-%lang(it) %{_datadir}/%{name}/locales/it
-%lang(zh_CN) %{_datadir}/%{name}/locales/zh_CN
-%{_desktopdir}/kornelix-%{name}.desktop
-%{_mandir}/man1/*.1*
+%doc doc/{changelog,copyright,licenses}
+%attr(755,root,root) %{_bindir}/fotoxx
+%dir %{_datadir}/fotoxx
+%{_datadir}/fotoxx/data
+%{_datadir}/fotoxx/icons
+%{_datadir}/fotoxx/images
+%{_datadir}/metainfo/kornelix.fotoxx.metainfo.xml
+%{_desktopdir}/fotoxx.desktop
+%{_mandir}/man1/fotoxx.1*
diff --git a/fotoxx-Makefile.patch b/fotoxx-Makefile.patch
index ef9803a..f47ad55 100644
--- a/fotoxx-Makefile.patch
+++ b/fotoxx-Makefile.patch
@@ -1,34 +1,20 @@
---- fotoxx-9.7/Makefile.orig	2010-03-10 06:28:55.000000000 +0100
-+++ fotoxx-9.7/Makefile	2010-03-15 09:04:09.000000000 +0100
-@@ -5,8 +5,10 @@
- SOURCE = $(PROGRAM)-$(VERSION).cpp
- 
- # replace CFLAGS and LFLAGS -O3 with -g for GDB debugging
--CFLAGS = -O3 -Wall -c `pkg-config --cflags gtk+-2.0`
--LFLAGS = -O3 -Wall -rdynamic `pkg-config --libs gtk+-2.0 gthread-2.0`
-+CFLAGS := $(OPTCFLAGS) -Wall $(shell pkg-config --cflags gtk+-2.0)
-+LDFLAGS := $(OPTLDFLAGS) -rdynamic
-+LIBS := $(OPTLIBS) $(shell pkg-config --libs gtk+-2.0 gthread-2.0) -lfreeimage
-+CXX = g++
- 
- # use $PREFIX if defined, else assume /usr/local
- ifeq "$(PREFIX)" ""
-@@ -22,15 +24,15 @@
- 
- $(PROGRAM): $(PROGRAM).o zfuncs.o
- 	@ ./dependencies.sh
--	@ g++ $(LFLAGS) -lfreeimage -o $(PROGRAM) $(PROGRAM).o zfuncs.o                  # dynamic link
-+	$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- #	@ g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o /usr/lib/libfreeimage.a      # static link
- 
- $(PROGRAM).o: $(SOURCE)
--	@ g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE)		\
-+	$(CXX) $(CFLAGS) -c -o $@ $^ \
- 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
- 
- zfuncs.o: zfuncs.cpp
--	@ g++ $(CFLAGS) zfuncs.cpp	\
-+	$(CXX) $(CFLAGS) -c -o $@ $^ \
- 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
- 
- install: $(PROGRAM)
+--- fotoxx/Makefile.orig	2023-12-16 11:19:57.000000000 +0100
++++ fotoxx/Makefile	2025-10-08 18:49:42.582023392 +0200
+@@ -14,7 +14,7 @@ ifeq ($(CXX), clang++)
+       CXXFLAGS += -Wall -g -O0 -fsanitize=address -Wno-stringop-truncation
+       LDFLAGS += -fsanitize=address
+    else
+-      CXXFLAGS += -Wall -g -O2
++      CXXFLAGS += -Wall
+    endif
+ else                                                  #  GCC
+    ifdef DEBUG
+@@ -22,7 +22,7 @@ else
+                   -Wno-format-truncation -Wno-stringop-truncation
+       LDFLAGS += -fsanitize=address
+    else
+-      CXXFLAGS += -Wall -g2 -rdynamic -O2                               \
++      CXXFLAGS += -Wall -rdynamic \
+                   -Wno-format-truncation -Wno-stringop-truncation
+    endif
+ endif
diff --git a/fotoxx-desktop.patch b/fotoxx-desktop.patch
deleted file mode 100644
index 9e6415b..0000000
--- a/fotoxx-desktop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- fotoxx-9.4/desktop.orig	2010-01-08 14:11:20.000000000 +0100
-+++ fotoxx-9.4/desktop	2010-01-01 17:04:42.000000000 +0100
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Name=fotoxx
--Categories=Graphics
-+Categories=Graphics;
- Type=Application
- Terminal=false
--Exec=/usr/local/bin/fotoxx
--Icon=/usr/local/share/fotoxx/icons/fotoxx.png
-+Exec=/usr/bin/fotoxx
-+Icon=/usr/share/fotoxx/icons/fotoxx.png
- GenericName=Digital Photo Editor
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fotoxx.git/commitdiff/17fd1d804967d29f760a948a75414967fd092072

More information about the pld-cvs-commit mailing list