| 1 |
eva 11/01/24 23:48:36 |
| 2 |
|
| 3 |
Added: libnotify-0.7.1-gtk3-tests.patch |
| 4 |
Log: |
| 5 |
Version bump. 0.5 for last of gtk+:2 only release and 0.7 for testing API breakages, bug #340501. Add knotify to PDEPEND, bug #323593. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-libs/libnotify/files/libnotify-0.7.1-gtk3-tests.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libnotify/files/libnotify-0.7.1-gtk3-tests.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libnotify/files/libnotify-0.7.1-gtk3-tests.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libnotify-0.7.1-gtk3-tests.patch |
| 16 |
=================================================================== |
| 17 |
From 92983cacd36fa9b050f911bc4de09b8c4fb9f3b2 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Gilles Dartiguelongue <eva@g.o> |
| 19 |
Date: Thu, 16 Dec 2010 00:01:13 +0100 |
| 20 |
Subject: [PATCH] gentoo: do not build gtk+:3 tests if not required |
| 21 |
|
| 22 |
--- |
| 23 |
configure.ac | 5 +++++ |
| 24 |
tests/Makefile.am | 30 +++++++++++++++++------------- |
| 25 |
2 files changed, 22 insertions(+), 13 deletions(-) |
| 26 |
|
| 27 |
diff --git a/configure.ac b/configure.ac |
| 28 |
index 71609ed..7767c5b 100644 |
| 29 |
--- a/configure.ac |
| 30 |
+++ b/configure.ac |
| 31 |
@@ -97,10 +97,15 @@ AC_SUBST(PACKAGE_LIBS) |
| 32 |
AC_SUBST(PACKAGE_CFLAGS) |
| 33 |
AC_SUBST(pkg_modules) |
| 34 |
|
| 35 |
+AC_ARG_ENABLE([tests], |
| 36 |
+ AS_HELP_STRING([--enable-tests], [Check for extra dependencies to build all tests])) |
| 37 |
+AS_IF([test $enable_tests = yes], [ |
| 38 |
tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION" |
| 39 |
PKG_CHECK_MODULES(TESTS, [$tests_modules]) |
| 40 |
+]) |
| 41 |
AC_SUBST(TESTS_LIBS) |
| 42 |
AC_SUBST(TESTS_CFLAGS) |
| 43 |
+AM_CONDITIONAL([MORE_TESTS], [test $enable_tests = yes]) |
| 44 |
|
| 45 |
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` |
| 46 |
AC_SUBST(GLIB_GENMARSHAL) |
| 47 |
diff --git a/tests/Makefile.am b/tests/Makefile.am |
| 48 |
index 7acf9a3..2856a82 100644 |
| 49 |
--- a/tests/Makefile.am |
| 50 |
+++ b/tests/Makefile.am |
| 51 |
@@ -2,18 +2,15 @@ INCLUDES = \ |
| 52 |
-I$(top_srcdir) \ |
| 53 |
$(TESTS_CFLAGS) |
| 54 |
|
| 55 |
-noinst_PROGRAMS = \ |
| 56 |
+check_PROGRAMS = \ |
| 57 |
test-replace \ |
| 58 |
- test-replace-widget \ |
| 59 |
test-server-info \ |
| 60 |
test-default-action \ |
| 61 |
test-multi-actions \ |
| 62 |
test-action-icons \ |
| 63 |
- test-image \ |
| 64 |
test-basic \ |
| 65 |
test-error \ |
| 66 |
test-markup \ |
| 67 |
- test-persistence \ |
| 68 |
test-resident \ |
| 69 |
test-rtl \ |
| 70 |
test-size-changes \ |
| 71 |
@@ -23,6 +20,22 @@ noinst_PROGRAMS = \ |
| 72 |
test-xy-actions \ |
| 73 |
test-xy-stress |
| 74 |
|
| 75 |
+#if MORE_TESTS |
| 76 |
+check_PROGRAMS += \ |
| 77 |
+ test-image \ |
| 78 |
+ test-replace-widget \ |
| 79 |
+ test-persistence |
| 80 |
+ |
| 81 |
+test_replace_widget_SOURCES = test-replace-widget.c |
| 82 |
+test_replace_widget_LDADD = $(common_ldflags) |
| 83 |
+ |
| 84 |
+test_image_SOURCES = test-image.c |
| 85 |
+test_image_LDADD = $(common_ldflags) |
| 86 |
+ |
| 87 |
+test_persistence_SOURCES = test-persistence.c |
| 88 |
+test_persistence_LDADD = $(common_ldflags) |
| 89 |
+#endif |
| 90 |
+ |
| 91 |
common_ldflags = \ |
| 92 |
$(top_builddir)/libnotify/libnotify.la \ |
| 93 |
$(TESTS_LIBS) |
| 94 |
@@ -30,9 +43,6 @@ common_ldflags = \ |
| 95 |
test_replace_SOURCES = test-replace.c |
| 96 |
test_replace_LDADD = $(common_ldflags) |
| 97 |
|
| 98 |
-test_replace_widget_SOURCES = test-replace-widget.c |
| 99 |
-test_replace_widget_LDADD = $(common_ldflags) |
| 100 |
- |
| 101 |
test_server_info_SOURCES = test-server-info.c |
| 102 |
test_server_info_LDADD = $(common_ldflags) |
| 103 |
|
| 104 |
@@ -48,9 +58,6 @@ test_multi_actions_LDADD = $(common_ldflags) |
| 105 |
test_action_icons_SOURCES = test-action-icons.c |
| 106 |
test_action_icons_LDADD = $(common_ldflags) |
| 107 |
|
| 108 |
-test_image_SOURCES = test-image.c |
| 109 |
-test_image_LDADD = $(common_ldflags) |
| 110 |
- |
| 111 |
test_basic_SOURCES = test-basic.c |
| 112 |
test_basic_LDADD = $(common_ldflags) |
| 113 |
|
| 114 |
@@ -75,9 +82,6 @@ test_xy_stress_LDADD = $(common_ldflags) |
| 115 |
test_rtl_SOURCES = test-rtl.c |
| 116 |
test_rtl_LDADD = $(common_ldflags) |
| 117 |
|
| 118 |
-test_persistence_SOURCES = test-persistence.c |
| 119 |
-test_persistence_LDADD = $(common_ldflags) |
| 120 |
- |
| 121 |
test_resident_SOURCES = test-resident.c |
| 122 |
test_resident_LDADD = $(common_ldflags) |
| 123 |
|
| 124 |
-- |
| 125 |
1.7.4.rc2 |
Archives