From b72bd9a0be19dfe9fd8e5cb75566f4be1184be90 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 4 Sep 2018 21:50:10 +0200 Subject: [PATCH] New package: wxWidgets-gtk3-3.0.4 split common files with wxWidgets(-devel) in wxWidgets-common(-devel) [skip ci] --- common/shlibs | 19 +++++++-- srcpkgs/wxWidgets-common | 1 + srcpkgs/wxWidgets-common-devel | 1 + srcpkgs/wxWidgets-gtk3-devel | 1 + srcpkgs/wxWidgets-gtk3/template | 70 +++++++++++++++++++++++++++++++++ srcpkgs/wxWidgets-gtk3/update | 1 + 6 files changed, 90 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/wxWidgets-common create mode 120000 srcpkgs/wxWidgets-common-devel create mode 120000 srcpkgs/wxWidgets-gtk3-devel create mode 100644 srcpkgs/wxWidgets-gtk3/template create mode 100644 srcpkgs/wxWidgets-gtk3/update diff --git a/common/shlibs b/common/shlibs index 7ad1e360e0..51aec0520d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1530,8 +1530,8 @@ libaio.so.1 libaio-0.3.109_1 libofx.so.7 libofx-0.9.11_1 libsigsegv.so.2 libsigsegv-2.10_2 libfprint.so.0 libfprint-0.5.1_1 -libwx_baseu_xml-3.0.so.0 wxWidgets-3.0.0_1 -libwx_baseu-3.0.so.0 wxWidgets-3.0.0_1 +libwx_baseu_xml-3.0.so.0 wxWidgets-common-3.0.4_1 +libwx_baseu-3.0.so.0 wxWidgets-common-3.0.4_1 libwx_gtk2_adv-3.0.so.0 wxWidgets-3.0.0_1 libwx_base_xml-3.0.so.0 wxWidgets-3.0.0_1 libwx_gtk2_html-3.0.so.0 wxWidgets-3.0.0_1 @@ -1543,7 +1543,7 @@ libwx_gtk2u_gl-3.0.so.0 wxWidgets-3.0.0_1 libwx_gtk2u_stc-3.0.so.0 wxWidgets-3.0.0_1 libwx_gtk2u_adv-3.0.so.0 wxWidgets-3.0.0_1 libwx_gtk2u_qa-3.0.so.0 wxWidgets-3.0.0_1 -libwx_baseu_net-3.0.so.0 wxWidgets-3.0.0_1 +libwx_baseu_net-3.0.so.0 wxWidgets-common-3.0.4_1 libwx_gtk2u_core-3.0.so.0 wxWidgets-3.0.0_1 libwx_gtk2u_richtext-3.0.so.0 wxWidgets-3.0.0_1 libwx_gtk2u_propgrid-3.0.so.0 wxWidgets-3.0.0_1 @@ -3411,3 +3411,16 @@ liblqr-1.so.0 liblqr-0.4.2_1 libmozjs-60.so mozjs60-60.0.2_1 libmozjs-60.so.0 mozjs60-60.0.2_1 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1 +libwx_gtk3u_propgrid-3.0.so.0 wxWidgets-gtk3-3.0.4_1 +libwx_gtk3u_qa-3.0.so.0 wxWidgets-gtk3-3.0.4_1 +libwx_gtk3u_core-3.0.so.0 wxWidgets-gtk3-3.0.4_1 +libwx_gtk3u_html-3.0.so.0 wxWidgets-gtk3-3.0.4_1 +libwx_gtk3u_adv-3.0.so.0 wxWidgets-gtk3-3.0.4_1 +libwx_gtk3u_richtext-3.0.so.0 wxWidgets-gtk3-3.0.4_1 +libwx_gtk3u_xrc-3.0.so.0 wxWidgets-gtk3-3.0.4_1 +libwx_gtk3u_webview-3.0.so.0 wxWidgets-gtk3-3.0.4_1 +libwx_gtk3u_aui-3.0.so.0 wxWidgets-gtk3-3.0.4_1 +libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1 +libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1 +libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1 +libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1 diff --git a/srcpkgs/wxWidgets-common b/srcpkgs/wxWidgets-common new file mode 120000 index 0000000000..3544035849 --- /dev/null +++ b/srcpkgs/wxWidgets-common @@ -0,0 +1 @@ +wxWidgets-gtk3 \ No newline at end of file diff --git a/srcpkgs/wxWidgets-common-devel b/srcpkgs/wxWidgets-common-devel new file mode 120000 index 0000000000..3544035849 --- /dev/null +++ b/srcpkgs/wxWidgets-common-devel @@ -0,0 +1 @@ +wxWidgets-gtk3 \ No newline at end of file diff --git a/srcpkgs/wxWidgets-gtk3-devel b/srcpkgs/wxWidgets-gtk3-devel new file mode 120000 index 0000000000..3544035849 --- /dev/null +++ b/srcpkgs/wxWidgets-gtk3-devel @@ -0,0 +1 @@ +wxWidgets-gtk3 \ No newline at end of file diff --git a/srcpkgs/wxWidgets-gtk3/template b/srcpkgs/wxWidgets-gtk3/template new file mode 100644 index 0000000000..91d869f52f --- /dev/null +++ b/srcpkgs/wxWidgets-gtk3/template @@ -0,0 +1,70 @@ +# Template file for 'wxWidgets-gtk3' +pkgname=wxWidgets-gtk3 +version=3.0.4 +revision=1 +configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl --with-libmspack + --with-libnotify --enable-mediactrl" +build_style=gnu-configure +wrksrc="wxWidgets-${version}" +hostmakedepends="pkg-config" +makedepends="SDL2-devel gst-plugins-base1-devel gstreamer1-devel gtk+3-devel + libmspack-devel libnotify-devel tiff-devel webkit2gtk-devel glu-devel" +short_desc="The wxWidgets GUI toolkit library compiled with gtk3 support" +maintainer="Helmut Pozimski " +license="wxWindows" +homepage="https://www.wxwidgets.org" +distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2" +checksum=96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0 + +wxWidgets-common_package() { + short_desc+=" - common files" + pkg_install() { + vmove "usr/lib/libwx_baseu*.so.*" + vmove usr/share + } +} + +wxWidgets-common-devel_package() { + depends="wxWidgets-common>=${version}_${revision}" + short_desc+=" - common development files" + pkg_install() { + vmove "usr/bin/wxrc*" + vmove "usr/lib/libwx_baseu*.so" + vmove usr/include + if [ "$CROSS_BUILD" ]; then + rename -- "-${XBPS_CROSS_TRIPLET}" "" ${PKGDESTDIR}/usr/lib/* + fi + } +} + +wxWidgets-gtk3-devel_package() { + depends="${sourcepkg}>=${version}_${revision} wxWidgets-common-devel>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/bin + vmove "usr/lib/*.so" + vmove usr/lib/wx + + mv ${PKGDESTDIR}/usr/bin/wx-config{,-gtk3} + # remove all occurrences of $XBPS_CROSS_TRIPLET + # wx-config: + # - mark this build as native build + # - ignore --host option; breaks configure scripts when + # cross compiling (isn’t necessary in our case anyway) + if [ "$CROSS_BUILD" ]; then + local _config="gtk3-unicode-3.0" + mv ${PKGDESTDIR}/usr/lib/wx/include/{${XBPS_CROSS_TRIPLET}-${_config},${_config}} + + rename "${XBPS_CROSS_TRIPLET}-" "" ${PKGDESTDIR}/usr/lib/wx/config/* + rename -- "-${XBPS_CROSS_TRIPLET}" "" ${PKGDESTDIR}/usr/lib/* + + sed -i -e "s/${XBPS_CROSS_TRIPLET}-//g" \ + -e "s/-${XBPS_CROSS_TRIPLET}//g" \ + -e 's/is_cross() { \[ "xyes" = "xyes" \]; }/is_cross() { \[ "xno" = "xyes" \]; }/g' \ + -e 's/--\*=\*)/--host=\*) continue;;\n\n --\*=\*)/' \ + ${PKGDESTDIR}/usr/lib/wx/config/${_config} + + ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-gtk3 + fi + } +} diff --git a/srcpkgs/wxWidgets-gtk3/update b/srcpkgs/wxWidgets-gtk3/update new file mode 100644 index 0000000000..76643c26cf --- /dev/null +++ b/srcpkgs/wxWidgets-gtk3/update @@ -0,0 +1 @@ +site="https://github.com/wxWidgets/wxWidgets/releases/latest"