summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2004-01-17 23:02:09 +0000
committerMichael Januszewski <spock@gentoo.org>2004-01-17 23:02:09 +0000
commitce12115db7828b2e08e9df277e68d0ef9e14b724 (patch)
treeca53e6550206722c685e6b727e04048023898518 /x11-terms
parentAdded support for 2.6 kernels, fixed a few minor issues with silent mode, add... (diff)
downloadhistorical-ce12115db7828b2e08e9df277e68d0ef9e14b724.tar.gz
historical-ce12115db7828b2e08e9df277e68d0ef9e14b724.tar.bz2
historical-ce12115db7828b2e08e9df277e68d0ef9e14b724.zip
Fixed a conflict between the borderless patch and the paste_mouse_outside patch.
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/aterm/Manifest2
-rw-r--r--x11-terms/aterm/files/aterm-0.4.2-borderless.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index 6b1c971e96bf..9ab251dc69f1 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -4,7 +4,7 @@ MD5 885ea11eea49f25c0a14c022ac33dc73 aterm-0.4.2-r5.ebuild 1686
MD5 c1abce5f5dce914d0f7775f5c5bfee2e aterm-0.4.2-r6.ebuild 1735
MD5 9aa7ef02cbcc05796a77a7cd9defd142 aterm-0.4.2-r7.ebuild 1864
MD5 bee39157a0491e747442baf4eed96348 metadata.xml 263
-MD5 1109dcca55994f56324dc3b15ca2d04b files/aterm-0.4.2-borderless.patch 4692
+MD5 56383dccdb085d09e33858081b774724 files/aterm-0.4.2-borderless.patch 4692
MD5 df2652026f1f4f3e4444db9cddc145b6 files/aterm-0.4.2-qtpaste.patch 2510
MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r4 128
MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r5 128
diff --git a/x11-terms/aterm/files/aterm-0.4.2-borderless.patch b/x11-terms/aterm/files/aterm-0.4.2-borderless.patch
index 28083c36802b..cc742c3755fe 100644
--- a/x11-terms/aterm/files/aterm-0.4.2-borderless.patch
+++ b/x11-terms/aterm/files/aterm-0.4.2-borderless.patch
@@ -81,7 +81,7 @@ diff -Bru aterm-cvs/src/rxvt.h aterm-cvs-modif/src/rxvt.h
#define Opt_scrollKeypress (1LU<<12)
#define Opt_transparent (1LU<<13)
#define Opt_transparent_sb (1LU<<14)
-+#define Opt_borderLess (1LU<<15)
++#define Opt_borderLess (1LU<<16)
/* place holder used for parsing command-line options */
#define Opt_Boolean (1LU<<31)