Gentoo Archives: gentoo-commits

From: "Peter Alfredsen (loki_val)" <loki_val@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/tasque/files: tasque-0.1.8-debug-fixup.patch
Date: Fri, 23 Jan 2009 20:13:24
Message-Id: E1LQSP2-0001RH-4k@stork.gentoo.org
1 loki_val 09/01/23 20:13:20
2
3 Added: tasque-0.1.8-debug-fixup.patch
4 Log:
5 Add Tasque. Ebuild by Andreas Proschofsky, bugs by me :-).
6 (Portage version: 2.2_rc23/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 app-misc/tasque/files/tasque-0.1.8-debug-fixup.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/tasque/files/tasque-0.1.8-debug-fixup.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/tasque/files/tasque-0.1.8-debug-fixup.patch?rev=1.1&content-type=text/plain
13
14 Index: tasque-0.1.8-debug-fixup.patch
15 ===================================================================
16 http://bugzilla.gnome.org/show_bug.cgi?id=566355
17
18 diff -NrU5 tasque-0.1.8.orig/configure.ac tasque-0.1.8/configure.ac
19 --- tasque-0.1.8.orig/configure.ac 2009-01-09 18:44:30.000000000 +0100
20 +++ tasque-0.1.8/configure.ac 2009-01-09 19:19:06.000000000 +0100
21 @@ -53,39 +53,12 @@
22 AC_SUBST(NOTIFY_SHARP_LIBS)
23
24 AC_ARG_ENABLE(debug,
25 AC_HELP_STRING([--enable-debug],
26 [Use 'Debug' Configuration [default=yes]]),
27 - enable_debug=$enableval, enable_debug=no)
28 + enable_debug=$enableval, enable_debug=yes)
29 AM_CONDITIONAL(ENABLE_DEBUG, test "x$enable_debug" = "xyes")
30 -if test "x$enable_debug" = "xyes" ; then
31 -# DEBUG_CONFIG_LIBRARIES=' ${pkglibdir}/Db4objects.Db4o.dll'
32 -# DEBUG_CONFIG_LIBS=' -r:${pkglibdir}/Db4objects.Db4o.dll'
33 -# AC_SUBST(DEBUG_CONFIG_LIBRARIES)
34 -# AC_SUBST(DEBUG_CONFIG_LIBS)
35 - CONFIG_REQUESTED="yes"
36 -fi
37 -AC_ARG_ENABLE(release,
38 - AC_HELP_STRING([--enable-release],
39 - [Use 'Release' Configuration [default=no]]),
40 - enable_release=$enableval, enable_release=no)
41 -AM_CONDITIONAL(ENABLE_RELEASE, test "x$enable_release" = "xyes")
42 -if test "x$enable_release" = "xyes" ; then
43 -# RELEASE_CONFIG_LIBRARIES=' ${pkglibdir}/Db4objects.Db4o.dll'
44 -# RELEASE_CONFIG_LIBS=' -r:${pkglibdir}/Db4objects.Db4o.dll'
45 -# AC_SUBST(RELEASE_CONFIG_LIBRARIES)
46 -# AC_SUBST(RELEASE_CONFIG_LIBS)
47 - CONFIG_REQUESTED="yes"
48 -fi
49 -if test -z "$CONFIG_REQUESTED" ; then
50 -# DEBUG_CONFIG_LIBRARIES=' ${pkglibdir}/Db4objects.Db4o.dll'
51 -# DEBUG_CONFIG_LIBS=' -r:${pkglibdir}/Db4objects.Db4o.dll'
52 -# AC_SUBST(DEBUG_CONFIG_LIBRARIES)
53 -# AC_SUBST(DEBUG_CONFIG_LIBS)
54 - AM_CONDITIONAL(ENABLE_DEBUG, true)
55 -fi
56 -
57
58 #
59 # DEFINES uses for #if statements
60 #
61 AC_ARG_WITH(dbus_service_dir, [ --with-dbus-service-dir=DIR Where to install Tasque's DBus service file.])
62 @@ -225,11 +198,10 @@
63 echo "
64 Configuration:
65
66 Prefix: ${prefix}
67 Debug build: ${enable_debug}
68 - Release build: ${enable_release}
69 Notification: ${enable_notify_sharp}
70 Dummy Backend: ${enable_backend_dummy}
71 Evolution Backend: ${enable_backend_eds}
72 ICECore Backend: ${enable_backend_icecore}
73 RTM Backend: ${enable_backend_rtm}
74 diff -NrU5 tasque-0.1.8.orig/RtmNet/Makefile.am tasque-0.1.8/RtmNet/Makefile.am
75 --- tasque-0.1.8.orig/RtmNet/Makefile.am 2009-01-09 18:44:30.000000000 +0100
76 +++ tasque-0.1.8/RtmNet/Makefile.am 2009-01-09 19:26:42.000000000 +0100
77 @@ -1,16 +1,18 @@
78 CSC = $(GMCS)
79
80 TARGET = RtmNet.dll
81
82 +CSFLAGS = -t:library -noconfig -codepage:utf8
83 +
84 if ENABLE_DEBUG
85 -CSFLAGS = -t:library -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
86 -endif
87 -if ENABLE_RELEASE
88 -CSFLAGS = -t:library -noconfig -codepage:utf8 -warn:4
89 +CSFLAGS += -warn:4 -debug -d:DEBUG
90 +TARGET_DEBUG_FILE = $(TARGET).mdb
91 +$(TARGET).mdb: $(TARGET)
92 endif
93
94 +
95 CSFILES = \
96 $(srcdir)/ApiKeyRequiredException.cs \
97 $(srcdir)/AssemblyInfo.cs \
98 $(srcdir)/Auth.cs \
99 $(srcdir)/AuthenticationRequiredException.cs \
100 @@ -45,20 +47,20 @@
101
102 $(TARGET): $(CSFILES)
103 $(CSC) -unsafe -out:$@ $(CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
104
105 tasquelibdir = $(prefix)/lib/tasque
106 -tasquelib_DATA = $(TARGET)
107 +tasquelib_DATA = $(TARGET) $(TARGET_DEBUG_FILE)
108
109 bin_SCRIPTS = $(WRAPPER)
110
111
112 EXTRA_DIST = \
113 $(CSFILES)
114
115 CLEANFILES = \
116 - $(TARGET) \
117 - $(TARGET).mdb
118 + $(TARGET_DEBUG_FILE) \
119 + $(TARGET)
120
121 DISTCLEANFILES = \
122 - $(TARGET) \
123 - $(TARGET).mdb
124 + $(TARGET_DEBUG_FILE) \
125 + $(TARGET)
126 diff -NrU5 tasque-0.1.8.orig/src/Makefile.am tasque-0.1.8/src/Makefile.am
127 --- tasque-0.1.8.orig/src/Makefile.am 2009-01-09 18:44:30.000000000 +0100
128 +++ tasque-0.1.8/src/Makefile.am 2009-01-09 19:15:58.000000000 +0100
129 @@ -2,20 +2,21 @@
130
131 CSC = $(GMCS)
132
133 TARGET = Tasque.exe
134 WRAPPER = tasque
135 +CSFLAGS = -noconfig -codepage:utf8
136
137 if GTK_2_12
138 GTK_2_12_CSFLAGS = -define:GTK_2_12
139 +CSFLAGS += $(GTK_2_12_CSFLAGS)
140 endif
141
142 if ENABLE_DEBUG
143 -CSFLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG $(GTK_2_12_CSFLAGS)
144 -endif
145 -if ENABLE_RELEASE
146 -CSFLAGS = -noconfig -codepage:utf8 -warn:4 $(GTK_2_12_CSFLAGS)
147 +CSFLAGS += -warn:4 -debug -d:DEBUG
148 +TARGET_DEBUG_FILE = $(TARGET).mdb
149 +$(TARGET).mdb: $(TARGET)
150 endif
151
152 if ENABLE_NOTIFY_SHARP
153 NOTIFY_SHARP_CSFLAGS = -define:ENABLE_NOTIFY_SHARP
154 endif
155 @@ -138,11 +139,11 @@
156
157 $(TARGET): $(CSFILES) Defines.cs
158 $(CSC) -unsafe -out:$@ $(CSFLAGS) $(NOTIFY_SHARP_CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
159
160 tasquelibdir = $(libdir)/tasque
161 -tasquelib_DATA = $(TARGET) $(TARGET).config $(TARGET).mdb
162 +tasquelib_DATA = $(TARGET) $(TARGET).config $(TARGET_DEBUG_FILE)
163
164 bin_SCRIPTS = $(WRAPPER)
165
166 $(WRAPPER): $(srcdir)/$(WRAPPER).in Makefile
167 sed -e "s|\@prefix\@|$(prefix)|g" \
168 @@ -154,12 +155,10 @@
169 -e "s|\@wrapper\@|$(WRAPPER)|g" \
170 -e "s|\@srcdir\@|$(PWD)|g" \
171 < $< > $@
172 chmod +x $(WRAPPER)
173
174 -$(TARGET).mdb: $(TARGET)
175 -
176 $(TARGET).config: $(srcdir)/$(TARGET).config.in Makefile
177 sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \
178 < $< > $@
179
180 Defines.cs: $(srcdir)/Defines.cs.in Makefile
181 @@ -187,15 +186,15 @@
182 pkgconfig_DATA = tasque.pc
183
184 CLEANFILES = \
185 $(TARGET) \
186 $(TARGET).config \
187 - $(TARGET).mdb \
188 + $(TARGET_DEBUG_FILE) \
189 $(WRAPPER) \
190 Defines.cs
191
192 DISTCLEANFILES = \
193 $(WRAPPER) \
194 $(TARGET) \
195 $(TARGET).config \
196 - $(TARGET).mdb \
197 + $(TARGET_DEBUG_FILE) \
198 Defines.cs