From: chexum <chexum@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] wxWidgets: correct patch
Date: Sun, 09 Jan 2022 15:42:27 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34963@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1502 bytes --]
There is a new pull request by chexum against master on the void-packages repository
https://github.com/chexum/void-packages wxwidgets
https://github.com/void-linux/void-packages/pull/34963
wxWidgets: correct patch
Tweak the wxWidgets patches so that they apply cleanly to Makefile.in
Unclear why it's needed, perhaps patch(1) has now less tolerance for whitespace mixups.
Without these changes, the patches report fuzz and failure for Makefile.in:
patching file Makefile.in
Hunk #1 succeeded at 15279 with fuzz 2 (offset 21 lines).
patching file Makefile.in
Hunk #1 FAILED at 16177.
Hunk #2 succeeded at 16187 (offset 34 lines).
Hunk #3 succeeded at 16204 (offset 34 lines).
1 out of 3 hunks FAILED -- saving rejects to file Makefile.in.rej
patching file build/bakefiles/wx.bkl
patching file src/common/translation.cpp
patching file utils/wxrc/Makefile.in
Hunk #1 succeeded at 119 (offset -6 lines).
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/34963.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wxwidgets-34963.patch --]
[-- Type: text/x-diff, Size: 6342 bytes --]
From c7a431003fad1fb425d737376da79964152dccf4 Mon Sep 17 00:00:00 2001
From: J Farkas <chexum+git@gmail.com>
Date: Sun, 9 Jan 2022 14:35:46 +0000
Subject: [PATCH] wxWidgets: correct patches
Tweak the wxWidgets patches so that they apply cleanly to Makefile.in
Unclear why it's needed, perhaps patch(1) has now less tolerance for whitespace mixups.
Without these changes, the patches report fuzz and failure for Makefile.in:
patching file Makefile.in
Hunk #1 succeeded at 15279 with fuzz 2 (offset 21 lines).
patching file Makefile.in
Hunk #1 FAILED at 16177.
Hunk #2 succeeded at 16187 (offset 34 lines).
Hunk #3 succeeded at 16204 (offset 34 lines).
1 out of 3 hunks FAILED -- saving rejects to file Makefile.in.rej
patching file build/bakefiles/wx.bkl
patching file src/common/translation.cpp
patching file utils/wxrc/Makefile.in
Hunk #1 succeeded at 119 (offset -6 lines).
---
.../wxWidgets/patches/wxGTK-collision.patch | 24 +++++++++----------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/wxWidgets/patches/wxGTK-collision.patch b/srcpkgs/wxWidgets/patches/wxGTK-collision.patch
index 46d4085d37f2..5ec31ebaceb1 100644
--- a/srcpkgs/wxWidgets/patches/wxGTK-collision.patch
+++ b/srcpkgs/wxWidgets/patches/wxGTK-collision.patch
@@ -1,9 +1,9 @@
diff -Naur Makefile.in Makefile.in
--- a/Makefile.in 2014-10-06 23:33:44.000000000 +0200
+++ b/Makefile.in 2014-11-19 10:48:18.752319058 +0100
-@@ -15258,9 +15258,11 @@
+@@ -15279,9 +15279,11 @@
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin3.m4)
@@ -15,18 +15,16 @@ diff -Naur Makefile.in Makefile.in
$(DYLIB_RPATH_INSTALL)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
for f in setup.h $(RCDEFS_H); do \
---- a/Makefile.in.orig 2020-04-30 21:43:35.176560163 +0200
-+++ b/Makefile.in 2020-04-30 21:45:48.927132300 +0200
-@@ -16177,7 +16177,7 @@
- $(INSTALL_DIR) $(DESTDIR)$(bindir)
- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
- $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+@@ -16177,7 +16179,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
-
- locale_install:
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -16153,7 +16155,7 @@
+
+ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -16185,7 +16187,7 @@
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
if test -f $(srcdir)/locale/$$l.mo ; then \
@@ -35,7 +33,7 @@ diff -Naur Makefile.in Makefile.in
fi ; \
done
-@@ -16170,7 +16172,7 @@
+@@ -16202,7 +16204,7 @@
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
if test -f $(srcdir)/locale/msw/$$l.mo ; then \
next reply other threads:[~2022-01-09 14:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-09 14:42 chexum [this message]
2022-01-09 14:44 ` [PR PATCH] [Updated] " chexum
2022-01-09 16:09 ` newbluemoon
2022-01-11 20:39 ` [PR PATCH] [Closed]: " ericonr
2022-01-11 20:39 ` ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34963@inbox.vuxu.org \
--to=chexum@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).