[gentoo-commits] gentoo-x86 commit in dev-php/php-gtk/files: php-gtk-2.0.1-gtkhtml314.patch php-gtk-2.0.0-no-cli-check.patch no-cli-check.patch

[gentoo-commits] gentoo-x86 commit in dev-php/php-gtk/files: php-gtk-2.0.1-gtkhtml314.patch php-gtk-2.0.0-no-cli-check.patch no-cli-check.patch

[Matti Bickel (mabi)]

mabi        11/12/14 22:53:28

  Added:                php-gtk-2.0.1-gtkhtml314.patch
                        php-gtk-2.0.0-no-cli-check.patch no-cli-check.patch
  Log:
  Moving package from dev-php5 to dev-php category (bug #324665)
  
  (Portage version: 2.2.0_alpha79/cvs/Linux x86_64, RepoMan options: --force)

Revision  Changes    Path
1.1                  dev-php/php-gtk/files/php-gtk-2.0.1-gtkhtml314.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/php-gtk/files/php-gtk-2.0.1-gtkhtml314.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/php-gtk/files/php-gtk-2.0.1-gtkhtml314.patch?rev=1.1&content-type=text/plain

Index: php-gtk-2.0.1-gtkhtml314.patch
===================================================================
--- a/ext/html/html.defs	2008-08-17 16:40:39.000000000 +0200
+++ b/ext/html/html.defs	2008-08-17 16:41:10.000000000 +0200
@@ -103,18 +103,6 @@
   (return-type "none")
 )
 
-(define-method request_paste
-  (of-object "GtkHTML")
-  (c-name "gtk_html_request_paste")
-  (return-type "int")
-  (parameters
-    '("GdkAtom" "selection")
-    '("gint" "type")
-    '("gint32" "time")
-    '("gboolean" "as_cite")
-  )
-)
-
 (define-method begin
   (of-object "GtkHTML")
   (c-name "gtk_html_begin")
--- a/ext/html/config.m4	2008-08-17 16:44:57.000000000 +0200
+++ b/ext/html/config.m4	2008-08-17 16:45:05.000000000 +0200
@@ -7,7 +7,7 @@
 [  --with-html             Enable GtkHtml support],no)
 
 if test "$PHP_GTK_HTML" != "no"; then
-  PKG_CHECK_MODULES(HTML, [libgtkhtml-3.8 >= html_required_version],
+  PKG_CHECK_MODULES(HTML, [libgtkhtml-3.14 >= html_required_version],
   have_html=yes, have_html=no)
   if test "$have_html" != "yes"; then
     AC_MSG_RESULT([Unable to locate libgtkhtml version html_required_version or higher: not building])



1.1                  dev-php/php-gtk/files/php-gtk-2.0.0-no-cli-check.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/php-gtk/files/php-gtk-2.0.0-no-cli-check.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/php-gtk/files/php-gtk-2.0.0-no-cli-check.patch?rev=1.1&content-type=text/plain

Index: php-gtk-2.0.0-no-cli-check.patch
===================================================================
--- config.m4.orig	2008-02-13 06:05:27.000000000 +0100
+++ config.m4	2008-03-03 23:38:00.000000000 +0100
@@ -27,11 +27,6 @@
     AC_MSG_ERROR(Could not locate PHP executable)
   fi
 
-  PHP_SAPI=`$PHP --version | head -1 | sed -n 's/.*(\(...\)).*/\1/p'`
-  if test "$PHP_SAPI" != "cli" ; then
-    AC_MSG_ERROR(PHP CLI version is required[,] $PHP_SAPI found)
-  fi
-
   AC_PROG_AWK
   PHP_SUBST(AWK)
 



1.1                  dev-php/php-gtk/files/no-cli-check.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/php-gtk/files/no-cli-check.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/php-gtk/files/no-cli-check.patch?rev=1.1&content-type=text/plain

Index: no-cli-check.patch
===================================================================
--- config.m4.old	2007-06-17 09:27:39.000000000 +0530
+++ config.m4	2007-06-17 09:27:47.000000000 +0530
@@ -27,11 +27,6 @@
     AC_MSG_ERROR(Could not locate PHP executable)
   fi
 
-  PHP_SAPI=`$PHP --version | sed -n 's/.*(\(...\)).*/\1/p'`
-  if test "$PHP_SAPI" != "cli" ; then
-    AC_MSG_ERROR(PHP CLI version is required[,] $PHP_SAPI found)
-  fi
-
   AC_PROG_AWK
   PHP_SUBST(AWK)