pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/xnedit/patches editors/xnedit: Remove patches ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/49f2f0bf8437
branches:  trunk
changeset: 381666:49f2f0bf8437
user:      micha <micha%pkgsrc.org@localhost>
date:      Mon Jul 11 12:41:39 2022 +0000

description:
editors/xnedit: Remove patches (merged upstream)

diffstat:

 editors/xnedit/patches/patch-source_Makefile.common |  24 ---------------------
 editors/xnedit/patches/patch-source_textSel.c       |  24 ---------------------
 2 files changed, 0 insertions(+), 48 deletions(-)

diffs (56 lines):

diff -r bd799e594899 -r 49f2f0bf8437 editors/xnedit/patches/patch-source_Makefile.common
--- a/editors/xnedit/patches/patch-source_Makefile.common       Mon Jul 11 12:36:30 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-source_Makefile.common,v 1.1 2022/01/28 11:50:12 micha Exp $
-
-Honor LDFLAGS.
-
-Upstream ticket: <https://sourceforge.net/p/xnedit/bugs/19/>
-Fixed with commit 8e9bf66e77b7108f5803c9945f6d799d11fa6091, remove this patch
-for next release.
-
---- source/Makefile.common.orig        2022-01-09 12:28:40.000000000 +0000
-+++ source/Makefile.common
-@@ -21,11 +21,11 @@ all: xnedit xnc
- xnedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB)
-       $(CC) $(CFLAGS) -c linkdate.c -o linkdate.o
-       $(CC) $(CFLAGS) $(OBJS) linkdate.o \
--       ../util/libNUtil.a $(XMLLIB) $(XLTLIB) $(LIBS) -o $@
-+       ../util/libNUtil.a $(LDFLAGS) $(XMLLIB) $(XLTLIB) $(LIBS) -o $@
- 
- # Note LIBS isn't quite right here; it links unnecessarily against Motif
- xnc: nc.o server_common.o ../util/libNUtil.a
--      $(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@
-+      $(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LDFLAGS) $(LIBS) -o $@
- 
- help.o: help.c
-       $(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@
diff -r bd799e594899 -r 49f2f0bf8437 editors/xnedit/patches/patch-source_textSel.c
--- a/editors/xnedit/patches/patch-source_textSel.c     Mon Jul 11 12:36:30 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-source_textSel.c,v 1.1 2022/01/28 11:50:12 micha Exp $
-
-Enable codepath for Apple operating systems unconditionally.
-
-Otherwise inserting the X11 primary selection does not work in some cases
-(e.g. with selections from FLTK widgets on NetBSD).
-
-Upstream ticket: <https://sourceforge.net/p/xnedit/bugs/18/>
-Fixed with commit 20e0de407a217a279f229c216288a5f8aa1b309f, remove this patch
-for next release.
-
---- source/textSel.c.orig      2022-01-09 12:28:40.000000000 +0000
-+++ source/textSel.c
-@@ -251,7 +251,9 @@ void InsertPrimarySelection(Widget w, Ti
-     
-     selectionTime = time;
-     
--#ifdef __APPLE__
-+
-+/* #ifdef __APPLE__ */
-+#if 1
-     XtGetSelectionValue(w, XA_PRIMARY, targets[1], getSelectionCB, sel, time);
-     XtGetSelectionValue(w, XA_PRIMARY, targets[0], getSelectionCB, sel, time);
- #else



Home | Main Index | Thread Index | Old Index