Charlene Wendling <juliana...@posteo.jp> [2020-12-21, 15:11 +0100]:

> On Sat, 19 Dec 2020 16:09:50 +0200
> Timo Myyrä wrote:
>
>> Charlene Wendling <juliana...@posteo.jp> [2020-12-12, 13:37 +0100]:
>> 
>> > Hi,
>> >
>> > On Sat, 05 Dec 2020 09:25:26 +0200
>> > Timo Myyrä wrote:
>> >
>> >> Hi,
>> >> 
>> >> This updates icewm to latest release, works for me on amd64.
>> >> 
>> >> timo
>> >
>> > I've tested it successfully on macppc and amd64. OK cwen@
>> >
>
>> 
>> Icewm had new release since, here's updated diff.
>> This version changes the default image rendering library from
>> gdb-pixbuf-xlib to Imlib2 so I changed the port as well to use Imlib2.
>
> I think it's great to do it right now so we won't have any problem
> later (gdk-pixbuf-xlib has been deprecated and archived by GNOME [0]).
>
>> Works for me on amd64.
>> 
>> timo
>> 
>
> Looks like gdk-pixbuf-xlib used to pull some libraries that are now
> missing; in an empty chroot i get: 
>
> Missing library for gio-2.0>=0.0
> Missing library for glib-2.0>=0.0
> Missing library for gmodule-2.0>=0.0
> Missing library for gobject-2.0>=0.0
> Missing library for pcre>=0.0
>
> port-lib-depends-check was not happy and asked for more LIB_DEPENDS
> as well:
>
> icewm-2.0.0(x11/icewm):
> Missing lib: cairo.13 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: gdk_pixbuf-2.0.3200 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: harfbuzz.15 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: pango-1.0.3801 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: pangocairo-1.0.3801 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: pangoft2-1.0.3801 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: rsvg-2.38 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: xml2.16 (/usr/local/bin/icewmbg) (NOT REACHABLE)
>
> I added them all explicitly; we could reduce the number of
> LIB_DEPENDS lines by playing with implicit dependencies (like
> gdk_pixbuf-2.0.3200 pulling xml2.16). But as seen by this update, it's
> a dangerous game to play.
>
> I've modified your diff below.
>
> This builds and works fine on amd64 and macppc, i've tested a number
> of themes, and met no issues with standard themes. Other themes may
> have a titlebar buttons issue, with the leftmost icon on the right
> side being slightly mangled.
>
> Charlène.
>
>
> [0] https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/icewm/Makefile,v
> retrieving revision 1.76
> diff -u -p -u -p -r1.76 Makefile
> --- Makefile  11 Nov 2020 09:51:46 -0000      1.76
> +++ Makefile  21 Dec 2020 13:54:44 -0000
> @@ -3,23 +3,25 @@
>  # unconditionally uses machine/apmvar.h and related structures/defines
>  ONLY_FOR_ARCHS=      ${APM_ARCHS}
>  
> -V=           1.8.3
> +V=           2.0.0
>  COMMENT=     small and fast window manager
>  DISTNAME=    icewm-${V}
>  EXTRACT_SUFX=        .tar.lz
>  CATEGORIES=  x11
> -REVISION=    0
>  
>  HOMEPAGE=    https://ice-wm.org/
>  
>  # LGPLv2 only
>  PERMIT_PACKAGE=      Yes
>  
> -WANTLIB += ${COMPILER_LIBCXX} FLAC ICE SM X11 Xcomposite Xdamage
> -WANTLIB += Xext Xfixes Xft Xinerama Xpm Xrandr Xrender ao c expat
> -WANTLIB += ffi fontconfig freetype fribidi gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0
> -WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 iconv intl
> -WANTLIB += m ogg pcre sndfile vorbis vorbisenc xcb z
> +WANTLIB += ${COMPILER_LIBCXX} FLAC ICE Imlib2 SM X11 Xcomposite
> +WANTLIB += Xdamage Xext Xfixes Xft Xinerama Xpm Xrandr Xrender
> +WANTLIB += ao c cairo cairo-gobject expat ffi fontconfig freetype
> +WANTLIB += fribidi gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
> +WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m ogg pango-1.0
> +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png rsvg-2
> +WANTLIB += sndfile vorbis vorbisenc xcb xcb-render xcb-shm xml2
> +WANTLIB += z
>  
>  COMPILER=    base-clang ports-gcc base-gcc
>  
> @@ -31,7 +33,15 @@ BUILD_DEPENDS=     devel/gettext,-tools \
>  LIB_DEPENDS= audio/libao \
>               audio/libsndfile \
>               devel/fribidi \
> -             graphics/gdk-pixbuf-xlib
> +             devel/glib2 \
> +             devel/harfbuzz \
> +             devel/pango \
> +             devel/pcre \
> +             graphics/cairo \
> +             graphics/gdk-pixbuf2 \
> +             graphics/imlib2 \
> +             textproc/libxml,-main \
> +             x11/gnome/librsvg
>  
>  RUN_DEPENDS= devel/desktop-file-utils
>  
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/icewm/distinfo,v
> retrieving revision 1.25
> diff -u -p -u -p -r1.25 distinfo
> --- distinfo  22 Sep 2020 12:02:31 -0000      1.25
> +++ distinfo  21 Dec 2020 13:54:44 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (icewm-1.8.3.tar.lz) = N7FR+Zd6AgzefrsjQZYcuWwJVMUgn8/RFRz2kHRvf9M=
> -SIZE (icewm-1.8.3.tar.lz) = 1686603
> +SHA256 (icewm-2.0.0.tar.lz) = RHgXK5Nvf33PwhIL6NjxU/11WTO/mLjpjj6uUMQUk5w=
> +SIZE (icewm-2.0.0.tar.lz) = 1694653
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/icewm/pkg/PLIST,v
> retrieving revision 1.23
> diff -u -p -u -p -r1.23 PLIST
> --- pkg/PLIST 22 Sep 2020 12:02:32 -0000      1.23
> +++ pkg/PLIST 21 Dec 2020 13:54:44 -0000
> @@ -125,10 +125,18 @@ share/icewm/icons/run_16x16.xpm
>  share/icewm/icons/run_32x32.xpm
>  share/icewm/icons/save_16x16.png
>  share/icewm/icons/save_32x32.png
> +share/icewm/icons/setscreen12_32x32.png
> +share/icewm/icons/setscreen12x_32x32.png
> +share/icewm/icons/setscreen1_32x32.png
> +share/icewm/icons/setscreen21_32x32.png
> +share/icewm/icons/setscreen21x_32x32.png
> +share/icewm/icons/setscreen2_32x32.png
>  share/icewm/icons/settings_16x16.xpm
>  share/icewm/icons/settings_32x32.xpm
>  share/icewm/icons/shutdown_16x16.xpm
>  share/icewm/icons/shutdown_32x32.xpm
> +share/icewm/icons/suspend_16x16.xpm
> +share/icewm/icons/suspend_32x32.xpm
>  share/icewm/icons/themes_16x16.xpm
>  share/icewm/icons/themes_32x32.xpm
>  share/icewm/icons/vim_16x16.xpm

Ah, I really should get those chroot builds going to avoid these kind of
issues.
The new diff works fine here as well.

timo

Reply via email to