summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
-rw-r--r--wxGTK-collision.patch6
3 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 170fcde253d5..a00cce3b4490 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -22,7 +22,7 @@ pkgbase = wxwidgets-dev-light
sha256sums = SKIP
sha256sums = 214c2d9211e3505e94008747352f5fa07203d4d9087535985a1b6084d4e40ac7
sha256sums = SKIP
- sha256sums = 7b41947bc72bf8d6edae67837d854390555cc5afc48dda618efd3021b5f6d7a8
+ sha256sums = 48b528acbbbbb0bc409c1efed04a0a055a5c81393ae3133c6339aee6821acfe5
pkgname = wxbase-dev-light
pkgdesc = wxWidgets Base. Development branch (GNOME/GStreamer free!)
@@ -62,4 +62,3 @@ pkgname = wxcommon-dev-light
provides = wxgtk-common-dev
conflicts = wxgtk-common-dev
options = !emptydirs
-
diff --git a/PKGBUILD b/PKGBUILD
index 60a85f510d0b..63c32f45d4fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,7 +31,7 @@ source=("wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v${pkgver
sha256sums=('SKIP'
'214c2d9211e3505e94008747352f5fa07203d4d9087535985a1b6084d4e40ac7'
'SKIP'
- '7b41947bc72bf8d6edae67837d854390555cc5afc48dda618efd3021b5f6d7a8'
+ '48b528acbbbbb0bc409c1efed04a0a055a5c81393ae3133c6339aee6821acfe5'
)
prepare() {
@@ -173,6 +173,7 @@ package_wxcommon-dev-light() {
make -C build-base DESTDIR="${pkgdir}" install
rm -fr "${pkgdir}/usr/bin/wx-config-3.1"
+ rm -fr "${pkgdir}/usr/bin/wxrc"
rm -fr "${pkgdir}/usr/lib"
install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxcommon-dev-light/LICENSE"
diff --git a/wxGTK-collision.patch b/wxGTK-collision.patch
index 46fc11dc32fe..a1006cd9d3c7 100644
--- a/wxGTK-collision.patch
+++ b/wxGTK-collision.patch
@@ -30,8 +30,8 @@ index 9b24d92a79..a189dcb454 100644
@@ -126,6 +126,7 @@ distclean: clean
@COND_USE_XRC_1@uninstall_wxrc:
- @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
-+@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)$(WX_FLAVOUR)$(EXEEXT)
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
++@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)$(WX_FLAVOUR)$(EXEEXT)
wxrc_wxrc.o: $(srcdir)/wxrc.cpp
- $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $(srcdir)/wxrc.cpp
+ $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $(srcdir)/wxrc.cpp