Ping :)
> Omar Polo <op@omarpolo.com> hat am 12.02.2023 11:09 CET geschrieben:
>
>
> ping :)
>
> On 2023/02/06 09:58:55 +0100, Omar Polo <op@omarpolo.com> wrote:
> > friendly ping.
> >
> > On 2023/01/30 15:38:52 +0100, Omar Polo <op@omarpolo.com> wrote:
> > > testing the graphics/nsxiv update I noticed a warning when viewing a
> > > gif file:
> > >
> > > Internal multi-frame gif and webp loaders are deprecated and will
> > > be removed soon. Please upgrade to Imlib2 v1.8.0 for
> > > multi-frame/animated image support.
> > >
> > > To avoid issues with future updates, here's a diff to update imlib2 to
> > > 1.10.0 and fix the dependant ports. Most of the fallout comes from
> > > dropping imlib-config in 1.7.5 (2021-12-06) in favour or pkg-config.
> > >
> > > I had to patch one file to add missing includes and looked at
> > > imlib2_load.c because of a warning of the compiler: while there I
> > > couldn't resist fixing the code to open+fstat instead of stat+open,
> > > and check st.st_size before mmap for overflow. will upstream if I
> > > don't forget.
> > >
> > > This is the situation with the dependencies (and some deps of the
> > > deps)
> > >
> > > # port build test runtime
> > > devel/giblib patch - -
> > > devel/libast patch - -
> > > games/xteddy OK - OK
> > > graphics/feh OK OK OK
> > > graphics/imlib2-heic OK - -
> > > graphics/libcaca OK - OK
> > > graphics/nsxiv OK OK OK
> > > graphics/p5-Image-Imlib2 OK okish -
> > > graphics/qiv OK - OK
> > > graphics/scrot OK - OK
> > > misc/toilet OK OK OK
> > > multimedia/lebiniou OK - -
> > > sysutils/conky OK - OK
> > > www/w3m,image OK - OK
> > > x11/bgs OK - OK
> > > x11/e16keyedit OK - -
> > > x11/enlightenment OK - OK
> > > x11/eterm patch - OK
> > > x11/fluxbox OK - OK
> > > x11/fluxter OK - -
> > > x11/hsetroot OK - OK
> > > x11/icewm OK OK OK
> > > x11/idesk patch - -
> > > x11/openbox OK OK OK
> > > x11/pmenu OK - OK
> > > x11/skippy patch - OK
> > > x11/tint2 OK - OK
> > > x11/wbar OK - OK
> > > x11/xmenu OK - OK
> > > x11/xnotify OK - OK
> > >
> > > "patch" means that it builds once patched, OK that it
> > > builds/tests/works fine, "-" that the port doesn't have test or I
> > > couldn't runtest it. The window manager were tested inside Xephyr
> > > should it make a difference.
> > >
> > > p5-Image-Imlib2 has some test succeeding and some failing, doesn't
> > > seem a regress from the update though.
> > >
> > > Below there's a diff for the update, to fix the build of the
> > > dependants and to fix WANTLIB in some other deps.
> > >
> > > Note that you need to completely remove libimlib2 before testing the
> > > update, I had strange failures in feh and xteddy when I still had
> > > libimlib2.so.6.0 installed that disappeared once i've nuked and
> > > rebuild them with only libimlib2.so.7.0.
> > >
> > > ok?
> >
> > in order, the patch touches
> >
> > - graphics/imlib2
> > - devel/giblib
> > - devel/libast
> > - graphics/libcaca
> > - graphics/p5-Image-Imlib2
> > - sysutils/conky
> > - x11/bgs
> > - x11/eterm
> > - x11/idesk
> > - x11/skippy
>
>
> Index: graphics/imlib2/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/graphics/imlib2/Makefile,v
> retrieving revision 1.45
> diff -u -p -r1.45 Makefile
> --- graphics/imlib2/Makefile 31 Mar 2022 14:20:41 -0000 1.45
> +++ graphics/imlib2/Makefile 30 Jan 2023 09:30:40 -0000
> @@ -1,37 +1,49 @@
> COMMENT= image manipulation library
>
> -DISTNAME= imlib2-1.4.10
> -REVISION= 0
> -SHARED_LIBS= Imlib2 6.0 # .5.9
> +DISTNAME= imlib2-1.10.0
> +SHARED_LIBS= Imlib2 7.0 # 11.0
> CATEGORIES= graphics
>
> -HOMEPAGE= http://www.enlightenment.org/p.php?p=about/libs/imlib2&l=en
> +HOMEPAGE= https://docs.enlightenment.org/api/imlib2/html/
>
> # BSD
> PERMIT_PACKAGE= Yes
>
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
>
> -WANTLIB= X11 Xext c freetype m xcb z \
> - jpeg>=62 gif>=5 png>=2 tiff>=35 bz2 id3tag>=3 \
> - lzma pthread zstd
> -LIB_DEPENDS+= graphics/jpeg \
> +WANTLIB += X11 X11-xcb Xau Xdmcp Xext Xrender aom bz2 c cairo
> +WANTLIB += cairo-gobject dav1d de265 expat ffi fontconfig freetype
> +WANTLIB += gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
> +WANTLIB += harfbuzz heif iconv id3tag intl jpeg lzma m openjp2
> +WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
> +WANTLIB += png pthread rsvg-2 tiff webp webpdemux x265 xcb xcb-render
> +WANTLIB += xcb-shm xml2 z zstd
> +
> +LIB_DEPENDS+= archivers/bzip2 \
> + audio/libid3tag \
> graphics/giflib \
> + graphics/jpeg \
> + graphics/libwebp \
> + graphics/openjp2 \
> graphics/png \
> graphics/tiff \
> - archivers/bzip2 \
> - audio/libid3tag
> + multimedia/libheif \
> + x11/gnome/librsvg
>
> SEPARATE_BUILD= Yes
> CONFIGURE_STYLE= gnu
> .if ${MACHINE_ARCH} == "i386"
> CONFIGURE_ARGS+= --disable-mmx
> .endif
> +
> +CONFIGURE_ARGS+= --without-jxl \
> + --without-ps
> +
> CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
> LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
>
> pre-configure:
> - ${SUBST_CMD} ${WRKSRC}/imlib2.pc.in ${WRKSRC}/imlib2-config.in
> + ${SUBST_CMD} ${WRKSRC}/imlib2.pc.in
>
> post-install:
> rm ${PREFIX}/lib/imlib2/filters/*.la ${PREFIX}/lib/imlib2/loaders/*.la
> Index: graphics/imlib2/distinfo
> ===================================================================
> RCS file: /home/cvs/ports/graphics/imlib2/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- graphics/imlib2/distinfo 28 Apr 2017 18:00:46 -0000 1.11
> +++ graphics/imlib2/distinfo 30 Jan 2023 08:25:06 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (imlib2-1.4.10.tar.gz) = OZB8mmKBTov/Bbr+N2Dba3mTuzgDgyvKrVTnm3VCPl4=
> -SIZE (imlib2-1.4.10.tar.gz) = 1016606
> +SHA256 (imlib2-1.10.0.tar.gz) = bl9c/3PlqBlZPZCOORCC1rUx4kXj8fLJ4J9jjlASlo4=
> +SIZE (imlib2-1.10.0.tar.gz) = 1122651
> Index: graphics/imlib2/patches/patch-imlib2-config_in
> ===================================================================
> RCS file: graphics/imlib2/patches/patch-imlib2-config_in
> diff -N graphics/imlib2/patches/patch-imlib2-config_in
> --- graphics/imlib2/patches/patch-imlib2-config_in 11 Mar 2022 19:22:32 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> ---- imlib2-config.in.orig Tue Nov 22 21:22:32 2016
> -+++ imlib2-config.in Tue Nov 22 21:24:13 2016
> -@@ -40,12 +40,12 @@ while test $# -gt 0; do
> - ;;
> - --cflags)
> - if test @prefix@/include != /usr/include ; then
> -- includes="-I@prefix@/include"
> -+ includes="-I@prefix@/include -I${X11BASE}/include"
> - fi
> - echo $includes
> - ;;
> - --libs)
> -- libdirs=-L@libdir@
> -+ libdirs="-L@libdir@ -L${X11BASE}/lib"
> - echo $libdirs -lImlib2
> - ;;
> - *)
> Index: graphics/imlib2/patches/patch-src_bin_imlib2_load_c
> ===================================================================
> RCS file: graphics/imlib2/patches/patch-src_bin_imlib2_load_c
> diff -N graphics/imlib2/patches/patch-src_bin_imlib2_load_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ graphics/imlib2/patches/patch-src_bin_imlib2_load_c 30 Jan 2023 13:55:26 -0000
> @@ -0,0 +1,32 @@
> +fix access/return garbage if stat fails
> +
> +while here convert it to fstat after open, and range check the value
> +we're about to mmap.
> +
> +Index: src/bin/imlib2_load.c
> +--- src/bin/imlib2_load.c.orig
> ++++ src/bin/imlib2_load.c
> +@@ -112,16 +112,19 @@ image_load_mem(const char *file, int *perr)
> + else
> + ext = file;
> +
> +- err = stat(file, &st);
> +- if (err)
> +- goto bail;
> +-
> + im = NULL;
> + fd = -1;
> + fdata = MAP_FAILED;
> +
> + fd = open(file, O_RDONLY);
> + if (fd < 0)
> ++ goto bail;
> ++
> ++ err = fstat(fd, &st);
> ++ if (err)
> ++ goto bail;
> ++
> ++ if (st.st_size > SIZE_MAX)
> + goto bail;
> +
> + fdata = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
> Index: graphics/imlib2/patches/patch-src_bin_imlib2_view_c
> ===================================================================
> RCS file: graphics/imlib2/patches/patch-src_bin_imlib2_view_c
> diff -N graphics/imlib2/patches/patch-src_bin_imlib2_view_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ graphics/imlib2/patches/patch-src_bin_imlib2_view_c 30 Jan 2023 08:31:55 -0000
> @@ -0,0 +1,14 @@
> +add missing includes
> +
> +Index: src/bin/imlib2_view.c
> +--- src/bin/imlib2_view.c.orig
> ++++ src/bin/imlib2_view.c
> +@@ -1,6 +1,8 @@
> + #include "config.h"
> + #include <Imlib2.h>
> +
> ++#include <sys/select.h>
> ++#include <time.h>
> + #include <X11/Xlib.h>
> + #include <X11/keysym.h>
> + #include <stdio.h>
> Index: graphics/imlib2/pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/graphics/imlib2/pkg/PLIST,v
> retrieving revision 1.9
> diff -u -p -r1.9 PLIST
> --- graphics/imlib2/pkg/PLIST 11 Mar 2022 19:22:32 -0000 1.9
> +++ graphics/imlib2/pkg/PLIST 30 Jan 2023 09:01:31 -0000
> @@ -1,34 +1,43 @@
> -bin/imlib2-config
> @bin bin/imlib2_bumpmap
> @bin bin/imlib2_colorspace
> @bin bin/imlib2_conv
> @bin bin/imlib2_grab
> +@bin bin/imlib2_load
> @bin bin/imlib2_poly
> @bin bin/imlib2_show
> @bin bin/imlib2_test
> @bin bin/imlib2_view
> include/Imlib2.h
> +include/Imlib2_Loader.h
> lib/imlib2/
> lib/imlib2/filters/
> -lib/imlib2/filters/bumpmap.so
> -lib/imlib2/filters/colormod.so
> -lib/imlib2/filters/testfilter.so
> +@so lib/imlib2/filters/bumpmap.so
> +@so lib/imlib2/filters/colormod.so
> +@so lib/imlib2/filters/testfilter.so
> lib/imlib2/loaders/
> -lib/imlib2/loaders/argb.so
> -lib/imlib2/loaders/bmp.so
> -lib/imlib2/loaders/bz2.so
> -lib/imlib2/loaders/ff.so
> -lib/imlib2/loaders/gif.so
> -lib/imlib2/loaders/id3.so
> -lib/imlib2/loaders/jpeg.so
> -lib/imlib2/loaders/lbm.so
> -lib/imlib2/loaders/png.so
> -lib/imlib2/loaders/pnm.so
> -lib/imlib2/loaders/tga.so
> -lib/imlib2/loaders/tiff.so
> -lib/imlib2/loaders/xpm.so
> -lib/imlib2/loaders/zlib.so
> -lib/libImlib2.a
> +@so lib/imlib2/loaders/ani.so
> +@so lib/imlib2/loaders/argb.so
> +@so lib/imlib2/loaders/bmp.so
> +@so lib/imlib2/loaders/bz2.so
> +@so lib/imlib2/loaders/ff.so
> +@so lib/imlib2/loaders/gif.so
> +@so lib/imlib2/loaders/heif.so
> +@so lib/imlib2/loaders/ico.so
> +@so lib/imlib2/loaders/id3.so
> +@so lib/imlib2/loaders/j2k.so
> +@so lib/imlib2/loaders/jpeg.so
> +@so lib/imlib2/loaders/lbm.so
> +@so lib/imlib2/loaders/lzma.so
> +@so lib/imlib2/loaders/png.so
> +@so lib/imlib2/loaders/pnm.so
> +@so lib/imlib2/loaders/svg.so
> +@so lib/imlib2/loaders/tga.so
> +@so lib/imlib2/loaders/tiff.so
> +@so lib/imlib2/loaders/webp.so
> +@so lib/imlib2/loaders/xbm.so
> +@so lib/imlib2/loaders/xpm.so
> +@so lib/imlib2/loaders/zlib.so
> +@static-lib lib/libImlib2.a
> lib/libImlib2.la
> @lib lib/libImlib2.so.${LIBImlib2_VERSION}
> lib/pkgconfig/imlib2.pc
> Index: devel/giblib/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/devel/giblib/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- devel/giblib/Makefile 11 Mar 2022 18:50:05 -0000 1.24
> +++ devel/giblib/Makefile 30 Jan 2023 10:22:16 -0000
> @@ -1,19 +1,19 @@
> COMMENT= utility library including a imlib2 wrapper
>
> DISTNAME= giblib-1.2.4
> -REVISION = 8
> +REVISION = 9
> SHARED_LIBS= giblib 1.6 # .1.6
>
> CATEGORIES= devel
>
> # BSD
> PERMIT_PACKAGE= Yes
> -WANTLIB= X11 Xext freetype m xcb z
> +
> +WANTLIB += Imlib2 X11 X11-xcb Xext freetype m xcb xcb-shm
>
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=project/slackbuildsdirectlinks/giblib/}
>
> LIB_DEPENDS= graphics/imlib2
> -WANTLIB += Imlib2>=1
>
> CONFIGURE_STYLE= gnu
> CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
> Index: devel/giblib/pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/devel/giblib/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- devel/giblib/pkg/PLIST 11 Mar 2022 18:50:05 -0000 1.5
> +++ devel/giblib/pkg/PLIST 30 Jan 2023 10:26:08 -0000
> @@ -11,7 +11,7 @@ include/giblib/gib_style.h
> include/giblib/gib_utils.h
> include/giblib/giblib.h
> include/giblib/giblib_config.h
> -lib/libgiblib.a
> +@static-lib lib/libgiblib.a
> lib/libgiblib.la
> @lib lib/libgiblib.so.${LIBgiblib_VERSION}
> lib/pkgconfig/giblib.pc
> Index: devel/giblib/patches/patch-configure
> ===================================================================
> RCS file: devel/giblib/patches/patch-configure
> diff -N devel/giblib/patches/patch-configure
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ devel/giblib/patches/patch-configure 30 Jan 2023 13:22:28 -0000
> @@ -0,0 +1,109 @@
> +imlib2-config is no more
> +
> +Index: configure
> +--- configure.orig
> ++++ configure
> +@@ -19773,101 +19773,8 @@ esac
> + fi
> + IMLIB2_CONFIG=$ac_cv_path_IMLIB2_CONFIG
> +
> +-if test -n "$IMLIB2_CONFIG"; then
> +- echo "$as_me:$LINENO: result: $IMLIB2_CONFIG" >&5
> +-echo "${ECHO_T}$IMLIB2_CONFIG" >&6
> +-else
> +- echo "$as_me:$LINENO: result: no" >&5
> +-echo "${ECHO_T}no" >&6
> +-fi
> +-
> +- echo "$as_me:$LINENO: checking for imlib2 - version >= 1.0.0" >&5
> +-echo $ECHO_N "checking for imlib2 - version >= 1.0.0... $ECHO_C" >&6
> +-
> +- no_imlib2=""
> +- if test "$IMLIB2_CONFIG" = "no" ; then
> +- no_imlib2=yes
> +- else
> +- IMLIB2_CFLAGS="`$IMLIB2_CONFIG $imlib2_config_args --cflags`"
> +- IMLIB2_LIBS="`$IMLIB2_CONFIG $imlib2_config_args --libs`"
> +-
> +- imlib2_config_major_version=`$IMLIB2_CONFIG $imlib2_config_args \
> +- --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
> +- imlib2_config_minor_version=`$IMLIB2_CONFIG $imlib2_config_args \
> +- --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
> +- imlib2_config_micro_version=`$IMLIB2_CONFIG $imlib2_config_args \
> +- --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
> +- imlib2_wanted_major_version="1"
> +- imlib2_wanted_minor_version="0"
> +- imlib2_wanted_micro_version="0"
> +-
> +- # Compare wanted version to what config script returned.
> +- # If I knew what library was being run, i'd probably also compile
> +- # a test program at this point (which also extracted and tested
> +- # the version in some library-specific way)
> +- if test "$imlib2_config_major_version" -lt \
> +- "$imlib2_wanted_major_version" \
> +- -o \( "$imlib2_config_major_version" -eq \
> +- "$imlib2_wanted_major_version" \
> +- -a "$imlib2_config_minor_version" -lt \
> +- "$imlib2_wanted_minor_version" \) \
> +- -o \( "$imlib2_config_major_version" -eq \
> +- "$imlib2_wanted_major_version" \
> +- -a "$imlib2_config_minor_version" -eq \
> +- "$imlib2_wanted_minor_version" \
> +- -a "$imlib2_config_micro_version" -lt \
> +- "$imlib2_wanted_micro_version" \) ; then
> +- # older version found
> +- no_imlib2=yes
> +- echo -n "*** An old version of imlib2 "
> +- echo -n "($imlib2_config_major_version"
> +- echo -n ".$imlib2_config_minor_version"
> +- echo ".$imlib2_config_micro_version) was found."
> +- echo -n "*** You need a version of imlib2 newer than "
> +- echo -n "$imlib2_wanted_major_version"
> +- echo -n ".$imlib2_wanted_minor_version"
> +- echo ".$imlib2_wanted_micro_version."
> +- echo "***"
> +- echo "*** If you have already installed a sufficiently new version, this error"
> +- echo "*** probably means that the wrong copy of the imlib2-config shell script is"
> +- echo "*** being found. The easiest way to fix this is to remove the old version"
> +- echo "*** of imlib2, but you can also set the IMLIB2_CONFIG environment to point to the"
> +- echo "*** correct copy of imlib2-config. (In this case, you will have to"
> +- echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf"
> +- echo "*** so that the correct libraries are found at run-time)"
> +- fi
> +-
> +- fi
> +- if test "x$no_imlib2" = x ; then
> +- echo "$as_me:$LINENO: result: yes" >&5
> +-echo "${ECHO_T}yes" >&6
> +-
> +-
> +-
> +- else
> +- echo "$as_me:$LINENO: result: no" >&5
> +-echo "${ECHO_T}no" >&6
> +- if test "$IMLIB2_CONFIG" = "no" ; then
> +- echo "*** The imlib2-config script installed by imlib2 could not be found"
> +- echo "*** If imlib2 was installed in PREFIX, make sure PREFIX/bin is in"
> +- echo "*** your path, or set the IMLIB2_CONFIG environment variable to the"
> +- echo "*** full path to imlib2-config."
> +- fi
> +- IMLIB2_CFLAGS=""
> +- IMLIB2_LIBS=""
> +- { { echo "$as_me:$LINENO: error: Cannot find imlib2: Is imlib2-config in the path?" >&5
> +-echo "$as_me: error: Cannot find imlib2: Is imlib2-config in the path?" >&2;}
> +- { (exit 1); exit 1; }; }
> +- fi
> +-
> +-
> +-
> +-
> +-
> +-
> +-
> +-IMLIB_LIBS=`imlib2-config --libs`
> +-IMLIB_CFLAGS=`imlib2-config --cflags`
> ++IMLIB_LIBS=`pkg-config --libs imlib2`
> ++IMLIB_CFLAGS=`pkg-config --cflags imlib2`
> +
> +
> +
> Index: devel/libast/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/devel/libast/Makefile,v
> retrieving revision 1.23
> diff -u -p -r1.23 Makefile
> --- devel/libast/Makefile 11 Mar 2022 18:50:28 -0000 1.23
> +++ devel/libast/Makefile 30 Jan 2023 11:01:31 -0000
> @@ -2,7 +2,7 @@ COMMENT= library of assorted spiffy thi
>
> DISTNAME= libast-0.7
> PKGNAME= ${DISTNAME}
> -REVISION = 8
> +REVISION = 9
> SHARED_LIBS += ast 3.0 # .2.1
> CATEGORIES= devel
>
> @@ -10,13 +10,16 @@ HOMEPAGE= http://eterm.sourceforge.net/
>
> # BSD
> PERMIT_PACKAGE= Yes
> -WANTLIB= ICE m SM freetype X11 Xau Xdmcp Xext \
> - xcb z Imlib2>=2
> +
> +WANTLIB += ICE Imlib2 SM X11 X11-xcb Xext freetype m pcre xcb
> +WANTLIB += xcb-shm z
>
> MASTER_SITES= http://www.eterm.org/download/
>
> -LIB_DEPENDS= graphics/imlib2
> +LIB_DEPENDS= devel/pcre \
> + graphics/imlib2
>
> CONFIGURE_STYLE= gnu
> +CONFIGURE_ARGS+= LDFLAGS=-L${LOCALBASE}/lib
>
> .include <bsd.port.mk>
> Index: devel/libast/pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/devel/libast/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- devel/libast/pkg/PLIST 11 Mar 2022 18:50:28 -0000 1.5
> +++ devel/libast/pkg/PLIST 30 Jan 2023 10:36:00 -0000
> @@ -20,8 +20,7 @@ include/libast/tok.h
> include/libast/types.h
> include/libast/url.h
> include/libast/vector_if.h
> -lib/libast.a
> +@static-lib lib/libast.a
> lib/libast.la
> @lib lib/libast.so.${LIBast_VERSION}
> -share/aclocal/
> share/aclocal/libast.m4
> Index: graphics/libcaca/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/graphics/libcaca/Makefile,v
> retrieving revision 1.38
> diff -u -p -r1.38 Makefile
> --- graphics/libcaca/Makefile 11 Mar 2022 19:22:40 -0000 1.38
> +++ graphics/libcaca/Makefile 30 Jan 2023 11:09:22 -0000
> @@ -3,6 +3,7 @@ COMMENT= color ascii art library
> V= 0.99.beta20
> DISTNAME= libcaca-${V}
> PKGNAME= ${DISTNAME:S/beta//}
> +REVISION = 0
> SHARED_LIBS += caca 2.0 # .0.99
> CATEGORIES= graphics
>
> @@ -23,7 +24,7 @@ CONFIGURE_ARGS+= --disable-x11 \
> --disable-imlib2
> .else
> LIB_DEPENDS = graphics/imlib2
> -WANTLIB += X11 Xext freetype xcb Imlib2>=1
> +WANTLIB += X11 X11-xcb Xext freetype xcb xcb-shm Imlib2>=1
> .endif
>
> MAKE_FLAGS= V=1
> Index: graphics/p5-Image-Imlib2/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/graphics/p5-Image-Imlib2/Makefile,v
> retrieving revision 1.36
> diff -u -p -r1.36 Makefile
> --- graphics/p5-Image-Imlib2/Makefile 11 Mar 2022 19:23:06 -0000 1.36
> +++ graphics/p5-Image-Imlib2/Makefile 30 Jan 2023 11:16:43 -0000
> @@ -1,13 +1,13 @@
> COMMENT= Perl interface to the Imlib2 image library
>
> DISTNAME= Image-Imlib2-2.03
> -REVISION= 4
> +REVISION= 5
> CATEGORIES= graphics
>
> # Perl
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += c X11 Xext freetype m perl z Imlib2>=1
> +WANTLIB += c perl Imlib2>=1
>
> LIB_DEPENDS= graphics/imlib2
>
> @@ -15,6 +15,5 @@ MAKE_ENV= TEST_POD=Yes
>
> MODULES= cpan
> CONFIGURE_STYLE=modbuild
> -
>
> .include <bsd.port.mk>
> Index: graphics/p5-Image-Imlib2/pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/graphics/p5-Image-Imlib2/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- graphics/p5-Image-Imlib2/pkg/PLIST 11 Mar 2022 19:23:06 -0000 1.7
> +++ graphics/p5-Image-Imlib2/pkg/PLIST 30 Jan 2023 11:17:31 -0000
> @@ -4,5 +4,6 @@ ${P5ARCH}/Image/Imlib2.pm
> ${P5ARCH}/auto/
> ${P5ARCH}/auto/Image/
> ${P5ARCH}/auto/Image/Imlib2/
> -${P5ARCH}/auto/Image/Imlib2/Imlib2.so
> +${P5ARCH}/auto/Image/Imlib2/Imlib2.bs
> +@so ${P5ARCH}/auto/Image/Imlib2/Imlib2.so
> @man man/man3p/Image::Imlib2.3p
> Index: graphics/p5-Image-Imlib2/patches/patch-Build_PL
> ===================================================================
> RCS file: graphics/p5-Image-Imlib2/patches/patch-Build_PL
> diff -N graphics/p5-Image-Imlib2/patches/patch-Build_PL
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ graphics/p5-Image-Imlib2/patches/patch-Build_PL 30 Jan 2023 13:24:29 -0000
> @@ -0,0 +1,34 @@
> +work around removed imlib2-config
> +
> +Index: Build.PL
> +--- Build.PL.orig
> ++++ Build.PL
> +@@ -1,26 +1,8 @@
> + use Module::Build;
> + use strict;
> +
> +-# We need to find imlib2-config
> +-my $CONFIG = "imlib2-config";
> +-
> +-my $version = `$CONFIG --version`;
> +-if (!$version) {
> +- warn 'You must install the imlib2 library before you can install
> +-Image::Imlib2. You can obtain imlib2 from
> +-http://sourceforge.net/projects/enlightenment/
> +-
> +-Alternatively, if you have downloaded and installed imlib2 and this
> +-still will not work, modify the $CONFIG variable inside Build.PL to
> +-point to the imlib2-config program that provides.
> +-';
> +- exit 0;
> +-} else {
> +- print "Found imlib2 $version";
> +-}
> +-
> +-my $libs = `$CONFIG --libs`;
> +-my $cflags = "-DX_DISPLAY_MISSING " . `$CONFIG --cflags`;
> ++my $libs = `pkg-config --libs imlib2`;
> ++my $cflags = "-DX_DISPLAY_MISSING " . `pkg-config --cflags imlib2`;
> +
> + my $build = Module::Build->new(
> + c_source => './lib/Image',
> Index: sysutils/conky/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/sysutils/conky/Makefile,v
> retrieving revision 1.64
> diff -u -p -r1.64 Makefile
> --- sysutils/conky/Makefile 5 Nov 2022 17:29:05 -0000 1.64
> +++ sysutils/conky/Makefile 30 Jan 2023 11:38:44 -0000
> @@ -6,7 +6,7 @@ COMMENT= light-weight system monitor
> GH_ACCOUNT= brndnmtthws
> GH_PROJECT= conky
> GH_TAGNAME= 1.9.0
> -REVISION= 22
> +REVISION= 23
>
> # remove after updating:
> DISTFILES= conky_0-{}${GH_TAGNAME}.tar.gz
> @@ -16,8 +16,9 @@ CATEGORIES= sysutils
> # mostly GPLv3; see COPYING
> PERMIT_PACKAGE= Yes
>
> -WANTLIB= c crypto curl curses glib-2.0 iconv intl kvm lzma m \
> - nghttp2 ossaudio pcre2-8 pthread ssl xml2 z ${MODLUA_WANTLIB}
> +WANTLIB += ${MODLUA_WANTLIB} X11-xcb c crypto curl curses glib-2.0 iconv
> +WANTLIB += intl kvm lzma m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl
> +WANTLIB += ossaudio pcre2-8 pthread ssl xcb-shm xml2 z
>
> MODULES= lang/lua
> MODLUA_SA= Yes
> Index: x11/bgs/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/x11/bgs/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- x11/bgs/Makefile 11 Mar 2022 20:15:22 -0000 1.18
> +++ x11/bgs/Makefile 30 Jan 2023 10:01:54 -0000
> @@ -2,6 +2,7 @@ COMMENT = simple background setter
>
> VERSION = 0.8
> DISTNAME = ${GH_PROJECT}-${VERSION}
> +REVISION = 0
> CATEGORIES = x11 graphics
>
> MAINTAINER = Joerg Jung <jung@openbsd.org>
> @@ -9,7 +10,7 @@ MAINTAINER = Joerg Jung <jung@openbsd.o
> # MIT/X
> PERMIT_PACKAGE = Yes
>
> -WANTLIB = X11 Xinerama c Imlib2 m Xext freetype z
> +WANTLIB = X11 Xinerama c Imlib2 m
>
> GH_ACCOUNT = Gottox
> GH_PROJECT = bgs
> Index: x11/eterm/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/x11/eterm/Makefile,v
> retrieving revision 1.48
> diff -u -p -r1.48 Makefile
> --- x11/eterm/Makefile 11 Mar 2022 20:15:29 -0000 1.48
> +++ x11/eterm/Makefile 30 Jan 2023 10:58:15 -0000
> @@ -6,7 +6,7 @@ DISTNAME= Eterm-$V
> DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
> # also see below
> PKGNAME= eterm-$V
> -REVISION= 0
> +REVISION= 1
> SHARED_LIBS += Eterm 1.0 # unknown
> CATEGORIES= x11
>
> @@ -18,8 +18,8 @@ PERMIT_PACKAGE= Yes
> MASTER_SITES= ${HOMEPAGE}/download/ \
> ${MASTER_SITE_SOURCEFORGE:=eterm/}
>
> -WANTLIB += ICE Imlib2 SM X11 XRes Xext ast c freetype iconv m ttf util
> -WANTLIB += xcb z
> +WANTLIB += ICE Imlib2 SM X11 X11-xcb XRes Xext ast c freetype
> +WANTLIB += iconv m pcre ttf util xcb xcb-shm z
>
> LIB_DEPENDS= converters/libiconv \
> devel/libast \
> Index: x11/eterm/patches/patch-src_pixmap_c
> ===================================================================
> RCS file: /home/cvs/ports/x11/eterm/patches/patch-src_pixmap_c,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-src_pixmap_c
> --- x11/eterm/patches/patch-src_pixmap_c 11 Mar 2022 20:15:29 -0000 1.2
> +++ x11/eterm/patches/patch-src_pixmap_c 30 Jan 2023 10:43:22 -0000
> @@ -1,6 +1,25 @@
> ---- src/pixmap.c.orig Wed Nov 14 18:27:41 2007
> -+++ src/pixmap.c Wed Nov 14 18:31:19 2007
> -@@ -1916,7 +1916,8 @@ update_desktop_info(int *w, int *h)
> +imlib_strerror is provided by Imlib2
> +
> +Index: src/pixmap.c
> +--- src/pixmap.c.orig
> ++++ src/pixmap.c
> +@@ -171,6 +171,7 @@ image_mode_any(unsigned char mode)
> + }
> +
> + #ifdef PIXMAP_SUPPORT
> ++#if 0
> + const char *
> + imlib_strerror(Imlib_Load_Error err)
> + {
> +@@ -224,6 +225,7 @@ imlib_strerror(Imlib_Load_Error err)
> + }
> + ASSERT_NOTREACHED_RVAL("");
> + }
> ++
No comments:
Post a Comment