Gentoo Archives: gentoo-commits

From: Philip Miess <Phil_miess@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/superposition:master commit in: app-text/presage/files/, app-text/presage/
Date: Tue, 24 Oct 2017 20:32:00
Message-Id: 1508877260.d9177582441cc010d450d96b2e47eb18d72e7a3a.Phil_miess@gentoo
1 commit: d9177582441cc010d450d96b2e47eb18d72e7a3a
2 Author: Philip Miess <Philip_Miess <AT> yahoo <DOT> com>
3 AuthorDate: Tue Oct 24 20:34:20 2017 +0000
4 Commit: Philip Miess <Phil_miess <AT> yahoo <DOT> com>
5 CommitDate: Tue Oct 24 20:34:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/user/superposition.git/commit/?id=d9177582
7
8 use patch to generate new patch
9
10 app-text/presage/Manifest | 2 +-
11 .../presage/files/presage-0.8.9-automagic.patch | 34 +++++++++++-----------
12 2 files changed, 18 insertions(+), 18 deletions(-)
13
14 diff --git a/app-text/presage/Manifest b/app-text/presage/Manifest
15 index f7aaccf..45cb716 100644
16 --- a/app-text/presage/Manifest
17 +++ b/app-text/presage/Manifest
18 @@ -1,3 +1,3 @@
19 -AUX presage-0.8.9-automagic.patch 4344 SHA256 01108beee4b326604bb07a86b686caa3633d039aee4c23ec229f245ac86b7730 SHA512 02e2d7f47e8f7eda0dce2c8f3911bd93a2372a2f4761f84201399cf103927a9c1cc9f7a408ec64e415c221fb3915ba1f8c2d045f6f99ee9af64abfe8adfc756d WHIRLPOOL b6f47942cc1732aee0cbe4229d96bd4b7bf2c4be4a0591f46d207bbc922a07d9223203520518d9c6a4361064ec33f797eece79bc121239c1a994fedf9b62a5b5
20 +AUX presage-0.8.9-automagic.patch 4425 SHA256 21e95d42cc08aaf89a686989f0e7d55c22868fd7603c8c76cd31bf1fbc9ed354 SHA512 e57ec49b442f8eb08c9a0a62572acab60b5aa0bfe88a0f8552a7959cbf38fa296d00a83c96e82e727bd21fc5ab07a4b3296b51b7929fea4ca69e4922ddfd3e3a WHIRLPOOL e568e83ecc6d24f7d9ce9b4aa93a45e3316501afba8e946ede2f3b012abae3fe1f935ac1ff09b293ced5858dec1b876c560e20803869b75eb59e9ff54aa165dc
21 DIST presage-0.8.9.tar.gz 2568505 SHA256 5541e9b350cc603a8d412704dcfa21342369b5b07c6da91947c7523c51678cd0 SHA512 62206497283b3d7d29546399ea94c5b82d95c91f09c14e48098e1a8791018ccfdda26c46227195cdf706c0097e02bf382360e0a9c7e824edcd86fdfa5f4c3db1 WHIRLPOOL 029d3366c94fc52ba0a8337197158cc53d6aba8c276d2ddd52f5f58b864a7da2388af5d67342ece1817a7863fea2f6b675e76bb1e3555df4a1ddd67296a65188
22 EBUILD presage-0.8.9.ebuild 1086 SHA256 ba32954e5bd98bbce17f0af5ea3f3453b483a148021cefaf172ad20e362d3203 SHA512 5a7c72bcf3eddae357e6360cab98b400540d4674293229963575d837a03f9ed5cd924206424406dc2e47c6fb8b23168fccea525ebfc963547071f42541a5cdbd WHIRLPOOL 0545a601864581de0ccd61cfa11de0d2b53e685e0f50ad106a4db9187d949181cd2d58a63fd1e7ac07a68253c803292fac86f88a391c378ab724d006215301e8
23
24 diff --git a/app-text/presage/files/presage-0.8.9-automagic.patch b/app-text/presage/files/presage-0.8.9-automagic.patch
25 index dcaf379..d821528 100644
26 --- a/app-text/presage/files/presage-0.8.9-automagic.patch
27 +++ b/app-text/presage/files/presage-0.8.9-automagic.patch
28 @@ -1,5 +1,5 @@
29 ---- a/configure.ac
30 -+++ b/configure.ac
31 +--- configure.ac 2017-10-24 16:21:02.605268927 -0400
32 ++++ configure.patched.ac 2017-10-24 16:29:24.098226985 -0400
33 @@ -23,7 +23,7 @@
34
35
36 @@ -9,7 +9,7 @@
37
38 AC_CONFIG_SRCDIR([src/lib/presage.cpp])
39 AC_CONFIG_HEADERS([config.h:config.hin])
40 -@@ -105,6 +105,13 @@
41 +@@ -106,6 +106,13 @@
42 dnl ==================
43 dnl Checks for ncurses
44 dnl ==================
45 @@ -23,7 +23,7 @@
46 AC_CHECK_LIB([curses],
47 [initscr],
48 [have_curses_library=true],
49 -@@ -113,12 +120,19 @@
50 +@@ -114,12 +121,19 @@
51 [have_curses_header=true],
52 [AC_MSG_WARN([curses header file not found. curses demo programs will not be built.])],
53 [])
54 @@ -44,7 +44,7 @@
55 AC_CHECK_LIB([tinyxml],
56 [main],
57 [have_tinyxml_library=true],
58 -@@ -127,6 +141,7 @@
59 +@@ -128,6 +142,7 @@
60 [have_tinyxml_header=true],
61 [AC_MSG_WARN([tinyxml library not found. Embedded tinyxml library will be built.])],
62 [])
63 @@ -52,7 +52,7 @@
64 if test "x$have_tinyxml_library" != "xtrue" -o "x$have_tinyxml_header" != "xtrue"
65 then
66 build_tinyxml=yes
67 -@@ -134,7 +149,7 @@
68 +@@ -135,7 +150,7 @@
69 build_tinyxml=no
70 AC_DEFINE([TIXML_USE_STL], [1], [Define to 1 to use STL string in TinyXML])
71 fi
72 @@ -61,7 +61,7 @@
73
74
75 dnl =================
76 -@@ -203,10 +218,15 @@
77 +@@ -204,10 +219,15 @@
78 dnl ==================
79 dnl Checks for CppUnit
80 dnl ==================
81 @@ -78,7 +78,7 @@
82
83
84 dnl ============================
85 -@@ -216,6 +236,7 @@
86 +@@ -217,6 +237,7 @@
87 dnl ===============
88 dnl Checks for SWIG
89 dnl ===============
90 @@ -86,7 +86,7 @@
91 AC_PATH_PROG([SWIG], [swig])
92 if test ! "$SWIG"
93 then
94 -@@ -227,6 +248,11 @@
95 +@@ -228,6 +249,11 @@
96 dnl =================
97 dnl Checks for Python
98 dnl =================
99 @@ -98,7 +98,7 @@
100 AM_PATH_PYTHON([2.0],
101 [],
102 [AC_MSG_WARN([Python not found. Python is required to build presage python binding. Python can be obtained from http://www.python.org])])
103 -@@ -239,7 +264,7 @@
104 +@@ -239,7 +265,7 @@
105 [AC_MSG_WARN([Python.h header file not found. Python development files are required to build presage python binding. Python can be obtained from http://www.python.org])],
106 [])
107 fi
108 @@ -107,18 +107,18 @@
109
110
111 AC_ARG_ENABLE([python-binding],
112 -@@ -262,6 +288,7 @@
113 +@@ -263,6 +289,7 @@
114 dnl ======================
115 dnl Checks for dbus python
116 dnl ======================
117 +
118 have_dbus_python=no
119 -if test "$PYTHON" != :
120 -then
121 -@@ -275,7 +299,7 @@
122 - fi
123 - AC_MSG_RESULT($have_dbus_python)
124 -fi
125 + if test "$PYTHON" != :
126 + then
127 +@@ -276,7 +303,7 @@
128 + fi
129 + AC_MSG_RESULT($have_dbus_python)
130 + fi
131 -AM_CONDITIONAL([HAVE_DBUS_PYTHON], [test "x$have_dbus_python" = "xyes"])
132 +AM_CONDITIONAL([HAVE_DBUS_PYTHON], [test "x$have_dbus_python" = "xyes" -a "x$enable_python" = "xyes"])