wok-next rev 21120

wxwidgets, wxwidgets28
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Jan 14 04:27:33 2019 +0200 (2019-01-14)
parents 7abe998c632a
children 80c115184401
files wxWidgets/description.txt wxWidgets/receipt wxWidgets28/description.txt wxWidgets28/receipt wxwidgets/.icon.png wxwidgets/description.txt wxwidgets/receipt wxwidgets28/description.txt wxwidgets28/receipt wxwidgets28/stuff/patches/no-lib64.patch wxwidgets28/stuff/patches/series wxwidgets28/stuff/patches/wxGTK-2.8.12-abicheck.patch wxwidgets28/stuff/patches/wxGTK-narrowing.patch
line diff
     1.1 --- a/wxWidgets/description.txt	Mon Jan 14 03:39:08 2019 +0200
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,26 +0,0 @@
     1.4 -wxWidgets is a free and open source cross-platform C++ framework for writing
     1.5 -advanced GUI applications using native controls.
     1.6 -
     1.7 -wxWidgets allows you to write native-looking GUI applications for all the major
     1.8 -desktop platforms and also helps with abstracting the differences in the non-GUI
     1.9 -aspects between them. It is free for the use in both open source and commercial
    1.10 -applications, comes with the full, easy to read and modify, source and extensive
    1.11 -documentation and a collection of more than a hundred examples.
    1.12 -
    1.13 -You can learn more about wxWidgets at <http://www.wxwidgets.org/> and read its
    1.14 -documentation online at <http://docs.wxwidgets.org/3.0.2/>
    1.15 -
    1.16 -
    1.17 -Further information
    1.18 --------------------
    1.19 -
    1.20 -If you are looking for support, you can get it from
    1.21 -
    1.22 -  - [wxForum](http://forums.wxwidgets.org/)
    1.23 -  - [wx-users mailing list](http://www.wxwidgets.org/support/maillst2.htm)
    1.24 -  - #wxwidgets IRC channel
    1.25 -  - <http://stackoverflow.com/> if you tag your question with "wxwidgets"
    1.26 -
    1.27 -Have fun!
    1.28 -
    1.29 -The wxWidgets Team, October 2014
     2.1 --- a/wxWidgets/receipt	Mon Jan 14 03:39:08 2019 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,66 +0,0 @@
     2.4 -# SliTaz package receipt v2.
     2.5 -
     2.6 -PACKAGE="wxWidgets"
     2.7 -VERSION="3.0.2"
     2.8 -CATEGORY="x-window"
     2.9 -SHORT_DESC="Cross-platform GUI Library"
    2.10 -MAINTAINER="devel@slitaz.org"
    2.11 -LICENSE="LGPL"
    2.12 -WEB_SITE="http://www.wxwidgets.org/"
    2.13 -REPOLOGY="wxwidgets"
    2.14 -
    2.15 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.16 -WGET_URL="$SF_MIRROR/wxwindows/$TARBALL"
    2.17 -
    2.18 -BUILD_DEPENDS="gtk2-dev expat-dev zlib-dev \
    2.19 -xorg-dev xorgproto glu mesa-dev libpng-dev tiff-dev \
    2.20 -jpeg-dev libxpm-dev patch libxshmfence-dev glu-dev"
    2.21 -SPLIT="$PACKAGE-dev"
    2.22 -
    2.23 -compile_rules() {
    2.24 -	sed -i 's/.*<string>/#include <cmath>\n&/;s/(abs(/(std::abs(/' \
    2.25 -		src/stc/scintilla/src/Editor.cxx
    2.26 -	./configure \
    2.27 -		--enable-shared \
    2.28 -		--enable-unicode \
    2.29 -		--with-opengl \
    2.30 -		--with-libpng=sys \
    2.31 -		--with-libxpm=sys \
    2.32 -		--with-libjpeg=sys \
    2.33 -		--with-libtiff=sys \
    2.34 -		--enable-graphics_ctx \
    2.35 -		--enable-unicode \
    2.36 -		$CONFIGURE_ARGS &&
    2.37 -	make &&
    2.38 -	make DESTDIR=$install install
    2.39 -}
    2.40 -
    2.41 -genpkg_rules() {
    2.42 -	case $PACKAGE in
    2.43 -		wxWidgets)
    2.44 -			mkdir -p $fs/usr
    2.45 -			# Copy libs and contrib libs.
    2.46 -			cp -a $install/usr/lib/ $fs/usr/
    2.47 -			# Remove devel files.
    2.48 -			rm -rf $fs/usr/lib/wx/include
    2.49 -			DEPENDS="glib glibc-base gcc-lib-base expat zlib atk \
    2.50 -			gtk2 libcairo fontconfig freetype jpeg libpng libtiff pango \
    2.51 -			pixman util-linux-uuid libsm libice libx11 \
    2.52 -			libxau libxcomposite libxcursor libxdamage \
    2.53 -			libxdmcp libxext glu libxfixes \
    2.54 -			libxinerama libxrender libxxf86vm mesa"
    2.55 -			;;
    2.56 -		*-dev)
    2.57 -			mkdir -p $fs/usr/lib/wx
    2.58 -			cp -a $install/usr/bin $fs/usr
    2.59 -			cp -a $install/usr/include $fs/usr
    2.60 -			# Just copy setup.h and contrib include
    2.61 -			cp -a $install/usr/lib/wx/include $fs/usr/lib/wx
    2.62 -
    2.63 -			cp -a $install/usr/share $fs/usr
    2.64 -			rm -r $fs/usr/share/locale
    2.65 -			DEPENDS="wxWidgets gtk2-dev libxinerama-dev libsm-dev \
    2.66 -			libice-dev expat zlib"
    2.67 -			;;
    2.68 -	esac
    2.69 -}
     3.1 --- a/wxWidgets28/description.txt	Mon Jan 14 03:39:08 2019 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,26 +0,0 @@
     3.4 -wxWidgets is a free and open source cross-platform C++ framework for writing
     3.5 -advanced GUI applications using native controls.
     3.6 -
     3.7 -wxWidgets allows you to write native-looking GUI applications for all the major
     3.8 -desktop platforms and also helps with abstracting the differences in the non-GUI
     3.9 -aspects between them. It is free for the use in both open source and commercial
    3.10 -applications, comes with the full, easy to read and modify, source and extensive
    3.11 -documentation and a collection of more than a hundred examples.
    3.12 -
    3.13 -You can learn more about wxWidgets at <http://www.wxwidgets.org/> and read its
    3.14 -documentation online at <http://docs.wxwidgets.org/3.0.2/>
    3.15 -
    3.16 -
    3.17 -Further information
    3.18 --------------------
    3.19 -
    3.20 -If you are looking for support, you can get it from
    3.21 -
    3.22 -  - [wxForum](http://forums.wxwidgets.org/)
    3.23 -  - [wx-users mailing list](http://www.wxwidgets.org/support/maillst2.htm)
    3.24 -  - #wxwidgets IRC channel
    3.25 -  - <http://stackoverflow.com/> if you tag your question with "wxwidgets"
    3.26 -
    3.27 -Have fun!
    3.28 -
    3.29 -The wxWidgets Team, October 2014
     4.1 --- a/wxWidgets28/receipt	Mon Jan 14 03:39:08 2019 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,71 +0,0 @@
     4.4 -# SliTaz package receipt v2.
     4.5 -
     4.6 -PACKAGE="wxWidgets28"
     4.7 -VERSION="2.8.12.1"
     4.8 -CATEGORY="x-window"
     4.9 -SHORT_DESC="Cross-platform GUI Library (oldstable version)"
    4.10 -MAINTAINER="devel@slitaz.org"
    4.11 -LICENSE="LGPL"
    4.12 -WEB_SITE="http://www.wxwidgets.org/"
    4.13 -REPOLOGY="wxwidgets28"
    4.14 -
    4.15 -TARBALL="wxPython-src-$VERSION.tar.bz2"
    4.16 -WGET_URL="$SF_MIRROR/wxwindows/$TARBALL"
    4.17 -
    4.18 -BUILD_DEPENDS="gtk2-dev expat-dev zlib-dev \
    4.19 -xorg-dev xorgproto glu mesa-dev libpng12-dev tiff-dev \
    4.20 -jpeg-dev libxpm-dev patch libxshmfence-dev glu-dev"
    4.21 -SPLIT="$PACKAGE-dev"
    4.22 -
    4.23 -compile_rules() {
    4.24 -	sed -i 's|/opt/wx/current/bin/||' wxPython/wx/build/build_options.py
    4.25 -	export CXXFLAGS="-Wno-narrowing"
    4.26 -	./configure \
    4.27 -		--enable-shared \
    4.28 -		--enable-unicode \
    4.29 -		--with-opengl \
    4.30 -		--with-libpng=sys \
    4.31 -		--with-libxpm=sys \
    4.32 -		--with-libjpeg=sys \
    4.33 -		--with-libtiff=sys \
    4.34 -		--enable-graphics_ctx \
    4.35 -		--enable-unicode \
    4.36 -		$CONFIGURE_ARGS &&
    4.37 -	make &&
    4.38 -	make DESTDIR=$install install &&
    4.39 -	cd $src/contrib &&
    4.40 -	{
    4.41 -		make &&
    4.42 -		make DESTDIR=$install install
    4.43 -	} 2>&1 | sed 's/h: No such/h: no such/'
    4.44 -}
    4.45 -
    4.46 -genpkg_rules() {
    4.47 -	case $PACKAGE in
    4.48 -		wxWidgets28)
    4.49 -			mkdir -p $fs/usr
    4.50 -			# Copy libs and contrib libs.
    4.51 -			cp -a $install/usr/lib/ $fs/usr/
    4.52 -			# Remove devel files.
    4.53 -			rm -rf $fs/usr/lib/wx/include
    4.54 -			DEPENDS="glib glibc-base gcc-lib-base expat zlib atk \
    4.55 -			gtk2 libcairo fontconfig freetype jpeg libpng12 libtiff pango \
    4.56 -			pixman util-linux-uuid libsm libice libx11 \
    4.57 -			libxau libxcomposite libxcursor libxdamage \
    4.58 -			libxdmcp libxext glu libxfixes \
    4.59 -			libxinerama libxrender libxxf86vm mesa"
    4.60 -			;;
    4.61 -		*-dev)
    4.62 -			mkdir -p $fs/usr/lib/wx
    4.63 -			cp -a $install/usr/bin $fs/usr
    4.64 -			cp -a $install/usr/include $fs/usr
    4.65 -			# Just copy setup.h and contrib include
    4.66 -			cp -a $install/usr/lib/wx/include $fs/usr/lib/wx
    4.67 -
    4.68 -			cp -a $install/usr/share $fs/usr
    4.69 -			rm -r $fs/usr/share/locale
    4.70 -			DEPENDS="wxWidgets28 gtk2-dev libxinerama-dev libsm-dev \
    4.71 -			libice-dev expat zlib"
    4.72 -			;;
    4.73 -	esac
    4.74 -}
     5.1 Binary file wxwidgets/.icon.png has changed
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/wxwidgets/description.txt	Mon Jan 14 04:27:33 2019 +0200
     6.3 @@ -0,0 +1,26 @@
     6.4 +wxWidgets is a free and open source cross-platform C++ framework for writing
     6.5 +advanced GUI applications using native controls.
     6.6 +
     6.7 +wxWidgets allows you to write native-looking GUI applications for all the major
     6.8 +desktop platforms and also helps with abstracting the differences in the non-GUI
     6.9 +aspects between them. It is free for the use in both open source and commercial
    6.10 +applications, comes with the full, easy to read and modify, source and extensive
    6.11 +documentation and a collection of more than a hundred examples.
    6.12 +
    6.13 +You can learn more about wxWidgets at <http://www.wxwidgets.org/> and read its
    6.14 +documentation online at <http://docs.wxwidgets.org/3.0.2/>
    6.15 +
    6.16 +
    6.17 +Further information
    6.18 +-------------------
    6.19 +
    6.20 +If you are looking for support, you can get it from
    6.21 +
    6.22 +  - [wxForum](http://forums.wxwidgets.org/)
    6.23 +  - [wx-users mailing list](http://www.wxwidgets.org/support/maillst2.htm)
    6.24 +  - #wxwidgets IRC channel
    6.25 +  - <http://stackoverflow.com/> if you tag your question with "wxwidgets"
    6.26 +
    6.27 +Have fun!
    6.28 +
    6.29 +The wxWidgets Team, October 2014
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/wxwidgets/receipt	Mon Jan 14 04:27:33 2019 +0200
     7.3 @@ -0,0 +1,43 @@
     7.4 +# SliTaz package receipt v2.
     7.5 +
     7.6 +PACKAGE="wxwidgets"
     7.7 +VERSION="3.0.4"
     7.8 +CATEGORY="x-window"
     7.9 +SHORT_DESC="Cross-platform GUI Library"
    7.10 +MAINTAINER="devel@slitaz.org"
    7.11 +LICENSE="LGPL"
    7.12 +WEB_SITE="http://www.wxwidgets.org/"
    7.13 +
    7.14 +TARBALL="wxWidgets-$VERSION.tar.bz2"
    7.15 +WGET_URL="https://github.com/wxWidgets/wxWidgets/releases/download/v$VERSION/$TARBALL"
    7.16 +TARBALL_SHA1=""
    7.17 +
    7.18 +BUILD_DEPENDS="zlib-dev libpng-dev libjpeg-turbo-dev tiff-dev xz-dev expat-dev \
    7.19 +gtk2-dev glib-dev xorg-libXxf86vm-dev libsm-dev mesa-dev glu-dev sdl2-dev \
    7.20 +libnotify-dev gstreamer1-dev gst1-plugins-base-dev cppunit-dev"
    7.21 +SPLIT="$PACKAGE-dev"
    7.22 +
    7.23 +DEPENDS_std="expat gdk-pixbuf glib gst1-plugins-base gstreamer1 gtk2 libcairo \
    7.24 +libjpeg-turbo libnotify libpng libsdl2 libsm libtiff libx11 libxxf86vm mesa \
    7.25 +pango python zlib"
    7.26 +
    7.27 +compile_rules() {
    7.28 +	./configure \
    7.29 +		--with-sdl \
    7.30 +		--with-opengl \
    7.31 +		--enable-unicode \
    7.32 +		--enable-aui \
    7.33 +		--enable-no_deps \
    7.34 +		--enable-shared \
    7.35 +		--enable-sound \
    7.36 +		--enable-mediactrl \
    7.37 +		--disable-rpath \
    7.38 +		$CONFIGURE_ARGS &&
    7.39 +	make &&
    7.40 +	make DESTDIR=$install install || return 1 # keep DESTDIR
    7.41 +
    7.42 +	fix symlinks
    7.43 +}
    7.44 +
    7.45 +PROVIDE_std="wxWidgets"
    7.46 +PROVIDE_dev="wxWidgets-dev"
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/wxwidgets28/description.txt	Mon Jan 14 04:27:33 2019 +0200
     8.3 @@ -0,0 +1,26 @@
     8.4 +wxWidgets is a free and open source cross-platform C++ framework for writing
     8.5 +advanced GUI applications using native controls.
     8.6 +
     8.7 +wxWidgets allows you to write native-looking GUI applications for all the major
     8.8 +desktop platforms and also helps with abstracting the differences in the non-GUI
     8.9 +aspects between them. It is free for the use in both open source and commercial
    8.10 +applications, comes with the full, easy to read and modify, source and extensive
    8.11 +documentation and a collection of more than a hundred examples.
    8.12 +
    8.13 +You can learn more about wxWidgets at <http://www.wxwidgets.org/> and read its
    8.14 +documentation online at <http://docs.wxwidgets.org/3.0.2/>
    8.15 +
    8.16 +
    8.17 +Further information
    8.18 +-------------------
    8.19 +
    8.20 +If you are looking for support, you can get it from
    8.21 +
    8.22 +  - [wxForum](http://forums.wxwidgets.org/)
    8.23 +  - [wx-users mailing list](http://www.wxwidgets.org/support/maillst2.htm)
    8.24 +  - #wxwidgets IRC channel
    8.25 +  - <http://stackoverflow.com/> if you tag your question with "wxwidgets"
    8.26 +
    8.27 +Have fun!
    8.28 +
    8.29 +The wxWidgets Team, October 2014
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/wxwidgets28/receipt	Mon Jan 14 04:27:33 2019 +0200
     9.3 @@ -0,0 +1,48 @@
     9.4 +# SliTaz package receipt v2.
     9.5 +
     9.6 +PACKAGE="wxwidgets28"
     9.7 +VERSION="2.8.12"
     9.8 +CATEGORY="x-window"
     9.9 +SHORT_DESC="Cross-platform GUI Library (oldstable version)"
    9.10 +MAINTAINER="devel@slitaz.org"
    9.11 +LICENSE="LGPL"
    9.12 +WEB_SITE="http://www.wxwidgets.org/"
    9.13 +
    9.14 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    9.15 +WGET_URL="https://github.com/wxWidgets/wxWidgets/archive/v$VERSION.tar.gz"
    9.16 +TARBALL_SHA1="536c564d27516f4b47b3fdd5a9160cfb2182f726"
    9.17 +
    9.18 +BUILD_DEPENDS="zlib-dev libjpeg-turbo-dev libpng-dev tiff-dev expat-dev \
    9.19 +gtk2-dev glib-dev libxinerama-dev libsm-dev mesa-dev glu-dev libxt-dev \
    9.20 +cppunit-dev" # sdl-dev gstreamer0-dev gst0-plugins-base-dev
    9.21 +SPLIT="$PACKAGE-dev"
    9.22 +
    9.23 +DEPENDS_std="expat gdk-pixbuf glib gtk2 libjpeg-turbo libpng libsm libtiff \
    9.24 +libxinerama libxxf86vm mesa pango zlib"
    9.25 +
    9.26 +COPY_std="wxrc wxrc-2.8 *.so* *.bkl"
    9.27 +COPY_dev="@dev config/ wx-config"
    9.28 +
    9.29 +compile_rules() {
    9.30 +	./configure \
    9.31 +		--with-sdl \
    9.32 +		--with-opengl \
    9.33 +		--enable-unicode \
    9.34 +		--enable-no_deps \
    9.35 +		--enable-shared \
    9.36 +		--enable-sound \
    9.37 +		--enable-mediactrl \
    9.38 +		--disable-rpath \
    9.39 +		$CONFIGURE_ARGS &&
    9.40 +	make &&
    9.41 +	make DESTDIR=$install install || return 1 # keep DESTDIR
    9.42 +
    9.43 +	fix symlinks
    9.44 +
    9.45 +#	cd $src/contrib
    9.46 +#	make &&
    9.47 +#	make DESTDIR=$install install # keep DESTDIR
    9.48 +}
    9.49 +
    9.50 +PROVIDE_std="wxWidgets28"
    9.51 +PROVIDE_dev="wxWidgets28-dev"
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/wxwidgets28/stuff/patches/no-lib64.patch	Mon Jan 14 04:27:33 2019 +0200
    10.3 @@ -0,0 +1,15 @@
    10.4 +--- a/configure
    10.5 ++++ b/configure
    10.6 +@@ -25043,12 +25043,7 @@
    10.7 +         ;;
    10.8 + 
    10.9 +     *-*-linux* )
   10.10 +-                if test "$ac_cv_sizeof_void_p" = 8 -a \
   10.11 +-                -d "/usr/lib64" -a ! -h "/usr/lib64"; then
   10.12 +-            wx_cv_std_libpath="lib64"
   10.13 +-        else
   10.14 +             wx_cv_std_libpath="lib"
   10.15 +-        fi
   10.16 +         ;;
   10.17 + 
   10.18 +     *)
    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/wxwidgets28/stuff/patches/series	Mon Jan 14 04:27:33 2019 +0200
    11.3 @@ -0,0 +1,5 @@
    11.4 +# from Alpine Linux: https://git.alpinelinux.org/aports/tree/main/wxgtk2.8?h=master
    11.5 +wxGTK-2.8.12-abicheck.patch
    11.6 +wxGTK-narrowing.patch
    11.7 +
    11.8 +no-lib64.patch
    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/wxwidgets28/stuff/patches/wxGTK-2.8.12-abicheck.patch	Mon Jan 14 04:27:33 2019 +0200
    12.3 @@ -0,0 +1,15 @@
    12.4 +diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
    12.5 +--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck	2015-03-12 17:15:18.000000000 +0100
    12.6 ++++ wxGTK-2.8.12/src/common/appbase.cpp	2015-03-12 17:15:57.000000000 +0100
    12.7 +@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
    12.8 +         msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
    12.9 +                    lib.c_str(), progName.c_str(), prog.c_str());
   12.10 + 
   12.11 +-        wxLogFatalError(msg.c_str());
   12.12 +-
   12.13 +-        // normally wxLogFatalError doesn't return
   12.14 +-        return false;
   12.15 ++        wxLogWarning(msg.c_str());
   12.16 +     }
   12.17 + #undef wxCMP
   12.18 + 
    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/wxwidgets28/stuff/patches/wxGTK-narrowing.patch	Mon Jan 14 04:27:33 2019 +0200
    13.3 @@ -0,0 +1,77 @@
    13.4 +Fix building with C++14, which errors out due to narrowing conversions.
    13.5 +See also: https://bugs.gentoo.org/show_bug.cgi?id=592442
    13.6 +
    13.7 +Patch by Francesco Turco
    13.8 +
    13.9 +--- a/src/gtk/bdiag.xbm
   13.10 ++++ b/src/gtk/bdiag.xbm
   13.11 +@@ -1,6 +1,6 @@
   13.12 + #define bdiag_width 16
   13.13 + #define bdiag_height 16
   13.14 + static char bdiag_bits[] = {
   13.15 +-   0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04,
   13.16 +-   0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10,
   13.17 +-   0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01};
   13.18 ++   (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10, (char)0x08, (char)0x08, (char)0x04, (char)0x04,
   13.19 ++   (char)0x02, (char)0x02, (char)0x01, (char)0x01, (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10,
   13.20 ++   (char)0x08, (char)0x08, (char)0x04, (char)0x04, (char)0x02, (char)0x02, (char)0x01, (char)0x01};
   13.21 +--- a/src/gtk/cdiag.xbm
   13.22 ++++ b/src/gtk/cdiag.xbm
   13.23 +@@ -1,6 +1,6 @@
   13.24 + #define cdiag_width 16
   13.25 + #define cdiag_height 16
   13.26 + static char cdiag_bits[] = {
   13.27 +-   0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24,
   13.28 +-   0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18,
   13.29 +-   0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81};
   13.30 ++   (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18, (char)0x18, (char)0x18, (char)0x24, (char)0x24,
   13.31 ++   (char)0x42, (char)0x42, (char)0x81, (char)0x81, (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18,
   13.32 ++   (char)0x18, (char)0x18, (char)0x24, (char)0x24, (char)0x42, (char)0x42, (char)0x81, (char)0x81};
   13.33 +--- a/src/gtk/cross.xbm
   13.34 ++++ b/src/gtk/cross.xbm
   13.35 +@@ -1,6 +1,6 @@
   13.36 + #define cross_width 15
   13.37 + #define cross_height 15
   13.38 + static char cross_bits[] = {
   13.39 +-   0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
   13.40 +-   0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
   13.41 +-   0xff, 0x7f, 0x84, 0x10, 0x84, 0x10};
   13.42 ++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
   13.43 ++   (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
   13.44 ++   (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10};
   13.45 +--- a/src/gtk/fdiag.xbm
   13.46 ++++ b/src/gtk/fdiag.xbm
   13.47 +@@ -1,6 +1,6 @@
   13.48 + #define fdiag_width 16
   13.49 + #define fdiag_height 16
   13.50 + static char fdiag_bits[] = {
   13.51 +-   0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20,
   13.52 +-   0x40, 0x40, 0x80, 0x80, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08,
   13.53 +-   0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80};
   13.54 ++   (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08, (char)0x10, (char)0x10, (char)0x20, (char)0x20,
   13.55 ++   (char)0x40, (char)0x40, (char)0x80, (char)0x80, (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08,
   13.56 ++   (char)0x10, (char)0x10, (char)0x20, (char)0x20, (char)0x40, (char)0x40, (char)0x80, (char)0x80};
   13.57 +--- a/src/gtk/horiz.xbm
   13.58 ++++ b/src/gtk/horiz.xbm
   13.59 +@@ -1,6 +1,6 @@
   13.60 + #define horiz_width 15
   13.61 + #define horiz_height 15
   13.62 + static char horiz_bits[] = {
   13.63 +-   0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   13.64 +-   0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   13.65 +-   0xff, 0x7f, 0x00, 0x00, 0x00, 0x00};
   13.66 ++   (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,
   13.67 ++   (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,
   13.68 ++   (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00};
   13.69 +--- a/src/gtk/verti.xbm
   13.70 ++++ b/src/gtk/verti.xbm
   13.71 +@@ -1,6 +1,6 @@
   13.72 + #define verti_width 15
   13.73 + #define verti_height 15
   13.74 + static char verti_bits[] = {
   13.75 +-   0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
   13.76 +-   0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
   13.77 +-   0x84, 0x10, 0x84, 0x10, 0x84, 0x10};
   13.78 ++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
   13.79 ++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
   13.80 ++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10};