Gentoo Archives: gentoo-commits

From: Amy Winston <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/
Date: Sun, 02 Oct 2016 20:09:31
Message-Id: 1475438313.4aaec36f0eb3afd0ce61d696016967d964a59db2.amynka@gentoo
1 commit: 4aaec36f0eb3afd0ce61d696016967d964a59db2
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Sep 30 15:11:58 2016 +0000
4 Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 2 19:58:33 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aaec36f
7
8 dev-tcltk/tdom: remove unused patches
9
10 dev-tcltk/tdom/files/tdom-0.8.2-expat.patch | 83 ----------------------------
11 dev-tcltk/tdom/files/tdom-0.8.2-soname.patch | 26 ---------
12 2 files changed, 109 deletions(-)
13
14 diff --git a/dev-tcltk/tdom/files/tdom-0.8.2-expat.patch b/dev-tcltk/tdom/files/tdom-0.8.2-expat.patch
15 deleted file mode 100644
16 index cdcbb10..00000000
17 --- a/dev-tcltk/tdom/files/tdom-0.8.2-expat.patch
18 +++ /dev/null
19 @@ -1,83 +0,0 @@
20 -Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
21 -Index: Makefile.in
22 -================================================================================
23 ---- configure.in
24 -+++ configure.in
25 -@@ -72,6 +72,7 @@
26 - #--------------------------------------------------------------------
27 -
28 - TDOM_PATH_AOLSERVER
29 -+TDOM_PATH_EXPAT
30 -
31 - #-----------------------------------------------------------------------
32 - # __CHANGE__
33 -@@ -83,10 +84,7 @@
34 - # and PKG_TCL_SOURCES.
35 - #-----------------------------------------------------------------------
36 -
37 --TEA_ADD_SOURCES([expat/xmlrole.c \
38 -- expat/xmltok.c \
39 -- expat/xmlparse.c \
40 -- generic/xmlsimple.c \
41 -+TEA_ADD_SOURCES([generic/xmlsimple.c \
42 - generic/utf8conv.c \
43 - generic/dom.c \
44 - generic/domalloc.c \
45 -@@ -100,7 +98,7 @@
46 - generic/tclexpat.c \
47 - generic/tdomStubInit.c])
48 - TEA_ADD_HEADERS([generic/tdom.h])
49 --TEA_ADD_INCLUDES([-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}])
50 -+TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES}])
51 - TEA_ADD_LIBS([${AOL_LIBS}])
52 - TEA_ADD_CFLAGS([])
53 - TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
54 ---- tdom.m4
55 -+++ tdom.m4
56 -@@ -215,6 +215,46 @@
57 - fi
58 - ])
59 -
60 -+
61 -+AC_DEFUN(TDOM_PATH_EXPAT, [
62 -+ AC_MSG_CHECKING([for expat])
63 -+ AC_ARG_WITH(expat,
64 -+ AC_HELP_STRING([--with-expat],
65 -+ [directory with expat installation]), , [with_expat=no])
66 -+
67 -+ AC_CACHE_VAL(ac_cv_c_expat,[
68 -+ case $with_expat in
69 -+ no) ;;
70 -+ yes)
71 -+ for f in /usr/local /usr; do
72 -+ if test -f "$f/include/expat.h" ; then
73 -+ ac_cv_c_expat=`(cd $f; pwd)`
74 -+ break
75 -+ fi
76 -+ done
77 -+ ;;
78 -+ *)
79 -+ if test -f "$with_expat/include/expat.h"; then
80 -+ ac_cv_c_expat=`(cd $with_expat; pwd)`
81 -+ else
82 -+ AC_MSG_ERROR([${with_expat} directory doesn't contain expat.h])
83 -+ fi
84 -+ esac
85 -+ ])
86 -+ if test x"${ac_cv_c_expat}" = x ; then
87 -+ AC_MSG_RESULT([using local copy])
88 -+ TEA_ADD_SOURCES([expat/xmlrole.c \
89 -+ expat/xmltok.c \
90 -+ expat/xmlparse.c])
91 -+ TEA_ADD_INCLUDES([-I${srcdir}/expat])
92 -+ else
93 -+ AC_MSG_RESULT([${ac_cv_c_expat}])
94 -+ TEA_ADD_INCLUDES(${ac_cv_c_expat}/include)
95 -+ TEA_ADD_LIBS([-lexpat])
96 -+ fi
97 -+])
98 -+
99 -+
100 - #------------------------------------------------------------------------
101 - # TDOM_PATH_CONFIG --
102 - #
103
104 diff --git a/dev-tcltk/tdom/files/tdom-0.8.2-soname.patch b/dev-tcltk/tdom/files/tdom-0.8.2-soname.patch
105 deleted file mode 100644
106 index 3f0bc7e..00000000
107 --- a/dev-tcltk/tdom/files/tdom-0.8.2-soname.patch
108 +++ /dev/null
109 @@ -1,26 +0,0 @@
110 -diff --git a/Makefile.in b/Makefile.in
111 -index d995328..5c17e11 100644
112 ---- a/Makefile.in
113 -+++ b/Makefile.in
114 -@@ -108,7 +108,7 @@ CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
115 - CFLAGS_WARNING = @CFLAGS_WARNING@
116 - CLEANFILES = @CLEANFILES@
117 - EXEEXT = @EXEEXT@
118 --LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
119 -+LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ -Wl,-soname,libdom$(PACKAGE_VERSION).so
120 - MAKE_LIB = @MAKE_LIB@
121 - MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
122 - MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
123 -diff --git a/extensions/tnc/Makefile.in b/extensions/tnc/Makefile.in
124 -index f8a332c..01e0ef0 100644
125 ---- a/extensions/tnc/Makefile.in
126 -+++ b/extensions/tnc/Makefile.in
127 -@@ -98,7 +98,7 @@ CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
128 - CFLAGS_WARNING = @CFLAGS_WARNING@
129 - CLEANFILES = @CLEANFILES@
130 - EXEEXT = @EXEEXT@
131 --LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
132 -+LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ -Wl,-soname,libtnc$(PACKAGE_VERSION).so
133 - MAKE_LIB = @MAKE_LIB@
134 - MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
135 - MAKE_STATIC_LIB = @MAKE_STATIC_LIB@