diff options
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | exact-image-1.0.2.patch | 85 |
3 files changed, 92 insertions, 19 deletions
@@ -1,7 +1,7 @@ pkgbase = exact-image pkgdesc = Fast image manipulation programs pkgver = 1.0.2 - pkgrel = 3 + pkgrel = 4 url = http://exactcode.com/opensource/exactimage/ arch = i686 arch = x86_64 @@ -11,13 +11,8 @@ pkgbase = exact-image depends = expat depends = libtiff source = http://dl.exactcode.de/oss/exact-image/exact-image-1.0.2.tar.bz2 - source = exact-image-c-98.patch - source = exact-image-const.patch - source = exact-image-types.patch + source = exact-image-1.0.2.patch sha256sums = 0694c66be5dec41377acead475de69b3d7ffb42c702402f8b713f8b44cdc2791 - sha256sums = 28509a0affb04336b16c8a8eddb19962a90f801743b76234e56e7d985df68293 - sha256sums = 2261015fbf19f48686f7c16c70295dbc71392c31426b469d45169d563dfa9e37 - sha256sums = 1a1f35db1287981065367f95b1a7e5098ecf53576176ada2653a1dabfa94264d + sha256sums = 0fd1f388c5d947df9bf71cfc822de2f3b25121dfe76dced1af89253df93df3b9 pkgname = exact-image - @@ -4,27 +4,20 @@ pkgname=exact-image pkgver=1.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="Fast image manipulation programs" arch=('i686' 'x86_64') url="http://exactcode.com/opensource/exactimage/" license=('GPL2') depends=('agg' 'jasper' 'expat' 'libtiff') source=("http://dl.exactcode.de/oss/exact-image/$pkgname-$pkgver.tar.bz2" - "$pkgname-c-98.patch" - "$pkgname-const.patch" - "$pkgname-types.patch") + "$pkgname-$pkgver.patch") sha256sums=('0694c66be5dec41377acead475de69b3d7ffb42c702402f8b713f8b44cdc2791' - '28509a0affb04336b16c8a8eddb19962a90f801743b76234e56e7d985df68293' - '2261015fbf19f48686f7c16c70295dbc71392c31426b469d45169d563dfa9e37' - '1a1f35db1287981065367f95b1a7e5098ecf53576176ada2653a1dabfa94264d') + '0fd1f388c5d947df9bf71cfc822de2f3b25121dfe76dced1af89253df93df3b9') prepare() { cd "$pkgname-$pkgver" - patch -p1 -i "$srcdir"/$pkgname-c-98.patch - patch -p1 -i "$srcdir"/$pkgname-types.patch - patch -p1 -i "$srcdir"/$pkgname-const.patch - sed -i 's+site_perl+5.30/vendor_perl+' api/perl/Makefile + patch -p1 -i "$srcdir"/$pkgname-$pkgver.patch } build() { diff --git a/exact-image-1.0.2.patch b/exact-image-1.0.2.patch new file mode 100644 index 000000000000..43487a2d824a --- /dev/null +++ b/exact-image-1.0.2.patch @@ -0,0 +1,85 @@ +diff -ruN a/api/perl/Makefile b/api/perl/Makefile +--- a/api/perl/Makefile 2017-05-05 10:29:04.000000000 -0400 ++++ b/api/perl/Makefile 2022-02-24 14:37:03.372889483 -0500 +@@ -20,5 +20,5 @@ + all:: $($(X_MODULE)_BINARY) + install:: $($(X_MODULE)_BINARY) + $(Q)echo "INSTALL PERL module $^" +- $(Q)mkdir -p $(DESTDIR)$(libdir)/perl5/site_perl/ +- $(Q)install $^ $(dir $^)/ExactImage.pm $(DESTDIR)$(libdir)/perl5/site_perl/ ++ $(Q)mkdir -p $(DESTDIR)$(libdir)/perl5/5.30/vendor_perl/ ++ $(Q)install $^ $(dir $^)/ExactImage.pm $(DESTDIR)$(libdir)/perl5/5.30/vendor_perl/ +diff -ruN a/codecs/jpeg2000.cc b/codecs/jpeg2000.cc +--- a/codecs/jpeg2000.cc 2017-07-21 10:19:01.000000000 -0400 ++++ b/codecs/jpeg2000.cc 2022-02-24 14:38:18.665809651 -0500 +@@ -67,14 +67,14 @@ + return stream; + } + +-static int cpp_jas_read (jas_stream_obj_t* obj, char* buf, int cnt) ++static int cpp_jas_read (jas_stream_obj_t* obj, char* buf, unsigned int cnt) + { + std::istream* stream = (std::istream*) obj; + stream->read (buf, cnt); + return cnt; + } + +-static int cpp_jas_write (jas_stream_obj_t* obj, char* buf, int cnt) ++static int cpp_jas_write (jas_stream_obj_t* obj, char* buf, unsigned int cnt) + { + std::ostream* stream = (std::ostream*) obj; + stream->write (buf, cnt); +diff -ruN a/gfx/X11Helper.cc b/gfx/X11Helper.cc +--- a/gfx/X11Helper.cc 2015-07-16 10:35:10.000000000 -0400 ++++ b/gfx/X11Helper.cc 2022-02-24 14:38:18.665809651 -0500 +@@ -123,7 +123,7 @@ + XGetWindowAttributes (dpy, window, &xgwa); + return xgwa.visual; + } +- ++#if 0 + Evas_Object* X11Window::CaptureIntoEvasImage (Evas* evas, + Display* dpy, + Window window, +@@ -232,7 +232,7 @@ + XDestroyImage (ximage2); + XDestroyImage (ximage); + } +- ++#endif + int X11Window::screen_number (Screen *screen) + { + Display *dpy = DisplayOfScreen (screen); +diff -ruN a/gfx/X11Helper.hh b/gfx/X11Helper.hh +--- a/gfx/X11Helper.hh 2015-07-16 10:35:10.000000000 -0400 ++++ b/gfx/X11Helper.hh 2022-02-24 14:38:18.665809651 -0500 +@@ -73,7 +73,7 @@ + + static int Depth (Display* dpy, Window window); + static Visual* ColorVisual (Display* dpy, Window window); +- ++#if 0 + static Evas_Object* CaptureIntoEvasImage (Evas* evas, + Display* dpy, + Window window, +@@ -83,7 +83,7 @@ + Display* dpy, + Window window, + int x, int y, int w, int h); +- ++#endif + static void StayOnTop (Display* dpy, Window win); + + private: +diff -ruN a/Makefile b/Makefile +--- a/Makefile 2016-06-18 15:35:35.000000000 -0400 ++++ b/Makefile 2022-02-24 14:38:18.669142966 -0500 +@@ -48,7 +48,7 @@ + # we have some unimplemented colorspaces in the Image::iterator :-( + CFLAGS += $(call cc-option,-Wno-switch -Wno-switch-enum,) + +-CXXFLAGS := $(CFLAGS) -Wno-sign-compare ++CXXFLAGS := $(CFLAGS) -Wno-sign-compare -std=gnu++98 -fpermissive + + ifeq "$(STATIC)" "1" + X_EXEFLAGS += -static |