$ git show --format=fuller --patch-with-stat --summary d590d6e7b66b6b48cac4d6a608e97465e8808083
commit d590d6e7b66b6b48cac4d6a608e97465e8808083
Author: tpgxyz <tpgxyz@gmail.com>
AuthorDate: Tue Jun 18 04:42:22 2019 +0200
Commit: tpgxyz <tpgxyz@gmail.com>
CommitDate: Tue Jun 18 04:42:22 2019 +0200
new version 1.6.8
---
.abf.yml | 2 +-
3f211616f6414bd9958566c0ca137e87a2b6df95.patch | 65 --------------------------
libX11-1.6.2-fix-typo.patch | 11 -----
libx11.spec | 7 +--
4 files changed, 3 insertions(+), 82 deletions(-)
delete mode 100644 3f211616f6414bd9958566c0ca137e87a2b6df95.patch
delete mode 100644 libX11-1.6.2-fix-typo.patch
diff --git a/.abf.yml b/.abf.yml
index f5dfb80..022fcc8 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- libX11-1.6.7.tar.bz2: 5076f7853713d7db958a05f6fd1c18f7e111a0ad
+ libX11-1.6.8.tar.bz2: f1ea96fe472a981d378b4f2eec90dcd063f9a407
diff --git a/3f211616f6414bd9958566c0ca137e87a2b6df95.patch b/3f211616f6414bd9958566c0ca137e87a2b6df95.patch
deleted file mode 100644
index 0e492ac..0000000
--- a/3f211616f6414bd9958566c0ca137e87a2b6df95.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 3f211616f6414bd9958566c0ca137e87a2b6df95 Mon Sep 17 00:00:00 2001
-From: Pavel Labath <pavelo@centrum.sk>
-Date: Fri, 30 Nov 2012 20:45:04 +0100
-Subject: Fix a leak in XCreateFontSet
-
-a simple snippet like XFreeFontSet(d, XCreateFontSet(d, ...)) will generate lots of memory leaks,
-as evidenced by the following valgrind output:
-==983== HEAP SUMMARY:
-==983== in use at exit: 39,409 bytes in 341 blocks
-==983== total heap usage: 4,795 allocs, 4,454 frees, 489,086 bytes allocated
-==983==
-==983== 1,688 (136 direct, 1,552 indirect) bytes in 1 blocks are definitely lost in loss record
-40 of 46
-==983== at 0x4C2B042: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
-==983== by 0x56D5A93: add_codeset.clone.9 (in /usr/lib64/libX11.so.6.3.0)
-==983== by 0x56D5FE0: load_generic (in /usr/lib64/libX11.so.6.3.0)
-==983== by 0x56D7612: initialize (in /usr/lib64/libX11.so.6.3.0)
-==983== by 0x56D7E75: _XlcCreateLC (in /usr/lib64/libX11.so.6.3.0)
-==983== by 0x56F9A5F: _XlcUtf8Loader (in /usr/lib64/libX11.so.6.3.0)
-==983== by 0x56DF815: _XOpenLC (in /usr/lib64/libX11.so.6.3.0)
-==983== by 0x56B255A: XOpenOM (in /usr/lib64/libX11.so.6.3.0)
-==983== by 0x56A665A: XCreateFontSet (in /usr/lib64/libX11.so.6.3.0)
-==983== by 0x4FCA80: conky::x11_output::create_gc() (x11.cc:746)
-==983== by 0x4FC3B4: conky::x11_output::use_own_window() (x11.cc:602)
-==983== by 0x4FAD42: conky::priv::own_window_setting::set(bool const&, bool) (x11.cc:92)
-==983==
-==983== LEAK SUMMARY:
-==983== definitely lost: 136 bytes in 1 blocks
-==983== indirectly lost: 1,552 bytes in 34 blocks
-==983== possibly lost: 0 bytes in 0 blocks
-==983== still reachable: 37,721 bytes in 306 blocks
-==983== suppressed: 0 bytes in 0 blocks
-
-This patch makes the leak dissappear (Well, at least the "definitely lost part". The "still
-reachable" thingy remains). After some analysis, I've discovered that the XLCd structure is
-destroyed improperly. The "constructor" is in lcGeneric.c, but the structure is destroyed using
-code from lcPublic.c. I've found that changing the destructor call to _XlcDestroyLC executes the
-correct code path, and I'm pretty sure this is correct (the object was constructed using
-_XlcCreateLC, it make sense to destroy it using its conterpart).
-
-So far I haven't observed any strange behaviour on my system caused by this change (although, I'm
-not sure, how many programs actually use this function).
-
-Signed-off-by: Pavel Labath <pavelo@centrum.sk>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
- src/xlibi18n/lcWrap.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xlibi18n/lcWrap.c b/src/xlibi18n/lcWrap.c
-index f2af240..d1fa259 100644
---- a/src/xlibi18n/lcWrap.c
-+++ b/src/xlibi18n/lcWrap.c
-@@ -328,7 +328,7 @@ _XCloseLC(
- for (prev = &lcd_list; (cur = *prev); prev = &cur->next) {
- if (cur->lcd == lcd) {
- if (--cur->ref_count < 1) {
-- (*lcd->methods->close)(lcd);
-+ _XlcDestroyLC(lcd);
- *prev = cur->next;
- Xfree(cur);
- }
---
-cgit v1.1
-
diff --git a/libX11-1.6.2-fix-typo.patch b/libX11-1.6.2-fix-typo.patch
deleted file mode 100644
index dc14c67..0000000
--- a/libX11-1.6.2-fix-typo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libX11-1.6.2/nls/en_US.UTF-8/Compose.pre.omv~ 2014-01-12 23:36:06.418561274 +0100
-+++ libX11-1.6.2/nls/en_US.UTF-8/Compose.pre 2014-01-12 23:36:15.601894317 +0100
-@@ -743,7 +743,7 @@ XCOMM Part 3
- <Multi_key> <i> <quotedbl> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
- <Multi_key> <diaeresis> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
- <Multi_key> <i> <diaeresis> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
--<dead_actute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
-+<dead_acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
- <Multi_key> <apostrophe> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
- <Multi_key> <j> <apostrophe> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
- <Multi_key> <acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
diff --git a/libx11.spec b/libx11.spec
index 803d88b..6fca25e 100644
--- a/libx11.spec
+++ b/libx11.spec
@@ -8,17 +8,14 @@
Summary: X Library
Name: libx11
-Version: 1.6.7
-Release: 4
+Version: 1.6.8
+Release: 1
Group: System/Libraries
License: MIT
Url: http://xorg.freedesktop.org
Source0: http://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2
Patch0: libX11-1.3.5-fix-null-pointer.patch
Patch1: libx11-fix-segfault.diff
-# (tpg) fix mem leak
-# https://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=3f211616f6414bd9958566c0ca137e87a2b6df95
-Patch2: 3f211616f6414bd9958566c0ca137e87a2b6df95.patch
BuildRequires: docbook-dtd43-xml
BuildRequires: docbook-style-xsl
BuildRequires: groff