[Pkg-urxvt-maintainers] [SCM] Git repository for pkg-urxvt branch, master, updated. debian/9.22-1-28-ge909968
Ryan Kavanagh
rak at moszumanska.debian.org
Thu Jan 4 19:26:18 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde//srv/git.debian.org/git/pkg-urxvt/pkg-urxvt.git;a=commitdiff;h=f3096a8
The following commit has been merged in the master branch:
commit f3096a84ab9bd4658c2e614bc1a5d12e0c62d98b
Author: Ryan Kavanagh <rak at debian.org>
Date: Tue Jan 2 14:08:32 2018 -0500
Drop old patches we no longer apply from source package
---
debian/patches/03_fix_xterm_scrollbar.diff | 17 ------------
debian/patches/04_no_urgency_on_focus.diff | 40 ---------------------------
debian/patches/05_cutchars.diff | 29 --------------------
debian/patches/09_binutils_gold.diff | 20 --------------
debian/patches/10_metabit.diff | 36 ------------------------
debian/patches/13_section_mismatch.diff | 26 ------------------
debian/patches/14_pod_errors.diff | 44 ------------------------------
debian/patches/15_perl_518.diff | 23 ----------------
8 files changed, 235 deletions(-)
diff --git a/debian/patches/03_fix_xterm_scrollbar.diff b/debian/patches/03_fix_xterm_scrollbar.diff
deleted file mode 100644
index 9cb8b04..0000000
--- a/debian/patches/03_fix_xterm_scrollbar.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: "Fix" xterm scrollbar border color
- This patch appeared in 9.05-3. We need to determine if we want to keep it.
-Author: Decklin Foster <decklin at red-bean.com>
-Origin: vendor
-Forwarded: no
-Reviewed-By: Unapplied by Ryan Kavanagh <ryanakca at kubuntu.org>
-Last-Update: 2011-03-14
---- rxvt-unicode-9.09.orig/src/scrollbar-xterm.C
-+++ rxvt-unicode-9.09/src/scrollbar-xterm.C
-@@ -55,7 +55,7 @@ scrollBar_t::show_xterm (int update)
- xscrollbarGC = XCreateGC (term->dpy, win,
- GCForeground | GCBackground
- | GCFillStyle | GCStipple, &gcvalue);
-- gcvalue.foreground = term->pix_colors_focused[Color_border];
-+ gcvalue.foreground = term->pix_colors_focused[Color_scroll];
- ShadowGC = XCreateGC (term->dpy, win, GCForeground, &gcvalue);
- }
diff --git a/debian/patches/04_no_urgency_on_focus.diff b/debian/patches/04_no_urgency_on_focus.diff
deleted file mode 100644
index df800d6..0000000
--- a/debian/patches/04_no_urgency_on_focus.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Don't set urgency hint if focused
- This patch, introduced in 9.05-2 didn't set the urgency hint if the window was
- focused. It was introducedas a "fix" to Debian bug 493981.
- .
- It was reverted by Ryan Kavanagh in 9.10-1 after discussion with upstream. The
- patch violates the ICCCM, which states:
- .
- ``The UrgencyHint flag, if set in the flags field, indicates that the client
- deems the window contents to be urgent, requiring the timely response of the
- user. [...] The window manager must also monitor the state of this flag for the
- entire time the window is in the Normal or Iconic state and must take
- appropriate action when the state of the flag changes. The flag is otherwise
- independent of the window's state.''
- .
- This means that if an application running in urxvt want the flag to be set, the
- flag should be set, regardless of the window's state / focus.
- .
- Further, it may be that the window is focused, but not visible, it which case
- the urgency flag is still useful.
-
-
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
-Author: Decklin Foster <decklin at red-bean.com>
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/493981
-Forwarded: no
-Reviewed-By: Dropped by Ryan Kavanagh <ryanakca at kubuntu.org>
-Last-Update: 2011-03-06
---- rxvt-unicode-9.09.orig/src/screen.C
-+++ rxvt-unicode-9.09/src/screen.C
-@@ -1928,7 +1928,7 @@ rxvt_term::scr_bell () NOTHROW
- # endif
-
- # if ENABLE_FRILLS
-- if (option (Opt_urgentOnBell))
-+ if (option (Opt_urgentOnBell) && !focus)
- set_urgency (1);
- # endif
diff --git a/debian/patches/05_cutchars.diff b/debian/patches/05_cutchars.diff
deleted file mode 100644
index 6f34d27..0000000
--- a/debian/patches/05_cutchars.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Set default cutchars, fix double-click word selection
- This patch appeared in 9.05-2.
- .
- It was unapplied in 9.10-1 at upstream's request to avoid deviation with
- upstream urxvt's behavior.
-Author: Decklin Foster <decklin at red-bean.com>
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/377194
-Reviewed-By: Unapplied by Ryan Kavanagh <ryanakca at kubuntu.org>
-Last-Update: 2011-03-06
-
---- rxvt-unicode-9.09.orig/src/perl/selection
-+++ rxvt-unicode-9.09/src/perl/selection
-@@ -12,11 +12,13 @@ sub on_user_command {
- sub on_init {
- my ($self) = @_;
-
-+ my $cutchars = '\`"\'&()*,;<=>?@[]{|}';
- if (defined (my $res = $self->resource ("cutchars"))) {
-- $res = $self->locale_decode ($res);
-- push @{ $self->{patterns} }, qr{\G [\Q$res\E[:space:]]* ([^\Q$res\E[:space:]]+) }x;
-+ $cutchars = $self->locale_decode ($res);
- }
-
-+ push @{ $self->{patterns} }, qr{\G [\Q$cutchars\E[:space:]]* ([^\Q$cutchars\E[:space:]]+) }x;
-+
- for (my $idx = 0; defined (my $res = $self->x_resource ("selection.pattern-$idx")); $idx++) {
- $res = $self->locale_decode ($res);
- utf8::encode $res;
diff --git a/debian/patches/09_binutils_gold.diff b/debian/patches/09_binutils_gold.diff
deleted file mode 100644
index 907ec8a..0000000
--- a/debian/patches/09_binutils_gold.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Link against libfontconfig to fix FTBFS with binutils-gold
- Dropped in 9.10, it is no longer needed.
-Author: Bhavani Shankar <bhavi at ubuntu.com>
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/604952
-Forwarded: no
-Reviewed-By: Dropped by Ryan Kavanagh <ryanakca at kubuntu.org>
-Last-Update: 2011-03-06
-
---- rxvt-unicode-9.09.orig/src/Makefile.in
-+++ rxvt-unicode-9.09/src/Makefile.in
-@@ -20,7 +20,7 @@ LDFLAGS = @LDFLAGS@
- DEFS = @DEFS@
- LIBS = @LIBS@
- XINC = @X_CFLAGS@ @AFTERIMAGE_CFLAGS@ @PIXBUF_CFLAGS@
--XLIB = @X_LIBS@ @AFTERIMAGE_LIBS@ -lX11 @X_EXTRA_LIBS@ @PIXBUF_LIBS@
-+XLIB = @X_LIBS@ @AFTERIMAGE_LIBS@ -lX11 -lfontconfig @X_EXTRA_LIBS@
- COMPILE = $(CXX) -I.. -I$(srcdir) -I. -I$(srcdir)/../libev $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(XINC)
- LINK = @LINKER@ $(LDFLAGS)
- EXEEXT = @EXEEXT@
diff --git a/debian/patches/10_metabit.diff b/debian/patches/10_metabit.diff
deleted file mode 100644
index e602463..0000000
--- a/debian/patches/10_metabit.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: "Fix" handling of 'meta8' option for non-latin1 locales
- This patch was unapplied because even the author admits that it is a hack.
- Further, it hardcodes UTF-8.
-Author: amateur <tianlei.zhao at gmail.com>
-Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558725#5
-Bug-Debian: http://bugs.debian.org/558725
-Forwarded: no
-Reviewed-By: Unapplied by Ryan Kavanagh <ryanakca at kubuntu.org>
-Last-Update: 2011-03-06
-
---- rxvt-unicode-9.09.orig/src/command.C
-+++ rxvt-unicode-9.09/src/command.C
-@@ -810,8 +810,21 @@ rxvt_term::key_press (XKeyEvent &ev)
- {
- char *ch;
-
-- for (ch = kbuf; ch < kbuf + len; ch++)
-- *ch |= 0x80;
-+ for (ch = kbuf; ch < kbuf + len; ch++) {
-+ /* UTF-8 encoding */
-+ char byte2 = 0x80 | (*ch & 0x3f);
-+ *ch = 0xC0 | (0x80 >> 6) | ((*ch >> 6) & 0x03);
-+ ch ++;
-+
-+ char * current = NULL;
-+ char * last = kbuf + len;
-+ for (current=last; current > ch; current--) {
-+ *current = *(current-1);
-+ }
-+
-+ len ++;
-+ *ch = byte2;
-+ }
-
- meta = 0;
- }
diff --git a/debian/patches/13_section_mismatch.diff b/debian/patches/13_section_mismatch.diff
deleted file mode 100644
index 55c353b..0000000
--- a/debian/patches/13_section_mismatch.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Set urxvtperl(3)'s .TH to 3 since we're installing in section 3
- Fixes warnings of a manpage with section header 1 installed in the section 3
- directory.
-Author: Ryan Kavanagh <rak at debian.org>
-Origin: vendor
-Forwarded: no
-Applied-Upstream: no
-Reviewed-by: Ryan Kavanagh <rak at debian.org>
-Last-Update: 2012-03-20
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: pkg-urxvt/src/Makefile.in
-===================================================================
---- pkg-urxvt.orig/src/Makefile.in 2013-02-12 12:12:29.255729563 -0500
-+++ pkg-urxvt/src/Makefile.in 2013-03-20 15:15:33.486168796 -0400
-@@ -120,8 +120,8 @@
- @IF_PERL@ > mantmp
- @IF_PERL@ $(INSTALL_DATA) mantmp $(DESTDIR)$(man1dir)/$(RXVTNAME)-extensions.$(man1ext)
- @IF_PERL@ < $(srcdir)/urxvt.pm \
-- at IF_PERL@ $(PERL) -MPod::Man -e '(new Pod::Man name => "$(RXVTNAME)perl", $(PODOPTS))->parse_from_file' \
-- at IF_PERL@ > mantmp
-+ at IF_PERL@ $(PERL) -MPod::Man -e '(new Pod::Man name => "$(RXVTNAME)perl", section => 3, \
-+ at IF_PERL@ $(PODOPTS))->parse_from_file' > mantmp
- @IF_PERL@ $(INSTALL_DATA) mantmp $(DESTDIR)$(man3dir)/$(RXVTNAME)perl.$(man3ext)
-
- install-bin: allbin
diff --git a/debian/patches/14_pod_errors.diff b/debian/patches/14_pod_errors.diff
deleted file mode 100644
index 434e145..0000000
--- a/debian/patches/14_pod_errors.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Fix POD errors in urxvt manpage
- Fixes various warnings from POD. This patch also includes a fix from Gregor
- Herrman <gregoa at debian.org> fixing a POD error which was causing rxvt-unicode
- to FTBFS
-Author: Ryan Kavanagh <rak at debian.org>
-Author: gregor herrman <gregoa at debian.org>
-Bug-Debian: http://bugs.debian.org/708026
-Origin: vendor
-Forwarded: no
-Applied-Upstream: no
-Reviewed-by: Ryan Kavanagh <rak at debian.org>
-Last-Update: 2013-03-20
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: rxvt-unicode/doc/rxvt.1.pod
-===================================================================
---- rxvt-unicode.orig/doc/rxvt.1.pod 2013-05-26 18:08:37.384696431 -0400
-+++ rxvt-unicode/doc/rxvt.1.pod 2013-05-26 18:08:37.376696226 -0400
-@@ -1207,8 +1207,12 @@
-
- Turn on/off ISO 14755 5.2 mode (default enabled).
-
-+=back
-+
- =head1 BACKGROUND IMAGE OPTIONS AND RESOURCES
-
-+=over 4
-+
- =item B<-pixmap> I<file[;oplist]>
-
- =item B<backgroundPixmap:> I<file[;oplist]>
-Index: rxvt-unicode/doc/rxvt.7.pod
-===================================================================
---- rxvt-unicode.orig/doc/rxvt.7.pod 2013-05-26 18:08:37.320694794 -0400
-+++ rxvt-unicode/doc/rxvt.7.pod 2013-05-26 18:08:47.260948834 -0400
-@@ -1037,8 +1037,6 @@
-
- xprop -root XIM_SERVERS
-
--=item
--
- =back
-
- =head3 My input method wants <some encoding> but I want UTF-8, what can I do?
diff --git a/debian/patches/15_perl_518.diff b/debian/patches/15_perl_518.diff
deleted file mode 100644
index 27656e3..0000000
--- a/debian/patches/15_perl_518.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix tabbed extension to conform to Perl 5.18
- Perl 5.18 no longer implicitly puts parentheses around qw(..), but instead
- requires them explicitly. The lack of these caused the tabbed extension to
- fail.
-Origin: http://bugs.debian.org/721456
-Author: gregor herrmann <gregoa at debian.org>
-Bug-Debian: http://bugs.debian.org/721456
-Applied-Upstream: already applied ages ago
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: rxvt-unicode/src/perl/tabbed
-===================================================================
---- rxvt-unicode.orig/src/perl/tabbed 2013-02-16 19:41:38.000000000 -0500
-+++ rxvt-unicode/src/perl/tabbed 2013-09-01 08:29:58.048828703 -0400
-@@ -402,7 +402,7 @@
- # simply proxies all interesting calls back to the tabbed class.
-
- {
-- for my $hook qw(start destroy key_press property_notify) {
-+ for my $hook (qw(start destroy key_press property_notify)) {
- eval qq{
- sub on_$hook {
- my \$parent = \$_[0]{term}{parent}
--
Git repository for pkg-urxvt
More information about the Pkg-urxvt-maintainers
mailing list