| 1 |
opfer 08/06/01 08:18:23 |
| 2 |
|
| 3 |
Added: gramps-3.0.1-no_scrollkeeper.patch |
| 4 |
Log: |
| 5 |
remove check for scrollkeeper from configure, patch provided by Zsolt Foldvari <zsolt DOT foldvari AT gmail DOT com> |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-misc/gramps/files/gramps-3.0.1-no_scrollkeeper.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/files/gramps-3.0.1-no_scrollkeeper.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/files/gramps-3.0.1-no_scrollkeeper.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gramps-3.0.1-no_scrollkeeper.patch |
| 15 |
=================================================================== |
| 16 |
Index: m4/Makefile.am |
| 17 |
=================================================================== |
| 18 |
--- m4/Makefile.am (revision 10747) |
| 19 |
+++ m4/Makefile.am (working copy) |
| 20 |
@@ -2,7 +2,6 @@ |
| 21 |
codeset.m4 \ |
| 22 |
gettext.m4 \ |
| 23 |
glibc21.m4 \ |
| 24 |
- gnome-doc-utils.m4 \ |
| 25 |
iconv.m4 \ |
| 26 |
intltool.m4 \ |
| 27 |
isc-posix.m4 \ |
| 28 |
Index: configure.in |
| 29 |
=================================================================== |
| 30 |
--- configure.in (revision 10747) |
| 31 |
+++ configure.in (working copy) |
| 32 |
@@ -10,7 +10,6 @@ |
| 33 |
AM_INIT_AUTOMAKE([1.6.3 foreign]) |
| 34 |
|
| 35 |
AC_CONFIG_MACRO_DIR([m4]) |
| 36 |
-GNOME_DOC_INIT |
| 37 |
|
| 38 |
RELEASE=0.SVN$(svnversion -n .) |
| 39 |
dnl RELEASE=0beta |
| 40 |
@@ -30,13 +29,6 @@ |
| 41 |
|
| 42 |
AM_SHARED_MIME |
| 43 |
AM_PACKAGER |
| 44 |
-dnl This is a hack to disable scrollkeeper update when in the packager mode. |
| 45 |
-dnl It may not seem good to purists, since we're defining |
| 46 |
-dnl ENABLE_SK_{TRUE,FALSE} twice, but I cannot see any other way |
| 47 |
-dnl without tweaking the gnome-doc-utils macros manually. |
| 48 |
-dnl So, scrollkeeper update is enabled when it would normally be, |
| 49 |
-dnl *provided* this is not the packager mode. Packager mode cancels it. |
| 50 |
-AM_CONDITIONAL(ENABLE_SK, test "x$packager_mode" = "xfalse" -a "x$enable_scrollkeeper" = "xyes") |
| 51 |
AC_SUBST(RELEASE) |
| 52 |
AC_SUBST(VERSIONSTRING) |
| 53 |
|
| 54 |
Index: INSTALL |
| 55 |
=================================================================== |
| 56 |
--- INSTALL (revision 10747) |
| 57 |
+++ INSTALL (working copy) |
| 58 |
@@ -35,7 +35,6 @@ |
| 59 |
The latter is possible, but you should supply additional arguments to |
| 60 |
autogen or configure: |
| 61 |
--with-mime-dir=$HOME/.local/share/mime |
| 62 |
- --disable-scrollkeeper |
| 63 |
Most likely, such local install will also need some prefix with write |
| 64 |
permissions for you: |
| 65 |
--prefix=$HOME/my_gramps_path |
| 66 |
Index: Makefile.am |
| 67 |
=================================================================== |
| 68 |
--- Makefile.am (revision 10747) |
| 69 |
+++ Makefile.am (working copy) |
| 70 |
@@ -7,7 +7,7 @@ |
| 71 |
config.rpath autogen.sh \ |
| 72 |
FAQ COPYING \ |
| 73 |
intltool-extract.in intltool-merge.in intltool-update.in \ |
| 74 |
- config.sub config.guess gnome-doc-utils.make |
| 75 |
+ config.sub config.guess |
| 76 |
|
| 77 |
bin_SCRIPTS = gramps |
| 78 |
|
| 79 |
@@ -18,8 +18,6 @@ |
| 80 |
DISTCLEANFILES = intltool-extract intltool-merge intltool-update \ |
| 81 |
gnome-doc-utils.make |
| 82 |
|
| 83 |
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper |
| 84 |
- |
| 85 |
gramps: gramps.sh |
| 86 |
cp gramps.sh gramps |
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
|
| 91 |
-- |
| 92 |
gentoo-commits@l.g.o mailing list |
Archives