From 0af2f722cc37a9c7d35a769b0959fe38bdc8a65339f9cf7d361fcc805f48e8b8 Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Wed, 25 May 2011 13:04:26 +0000
Subject: [PATCH] Accepting request 71245 from
 home:namtrac:branches:server:database:postgresql

Add postgresql-9.0.4-perl514.patch: For Perl 5.14 GvCV(sv) is no longer an lvalue and needs to be replaced by GvCV_set(sv, value)

About patch naming please see http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Patch_naming , its recommended that package version is in the patch name.

OBS-URL: https://build.opensuse.org/request/show/71245
OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=55
---
 postgresql-9.0.4-perl514.patch | 23 +++++++++++++++++++++++
 postgresql-libs.changes        |  6 ++++++
 postgresql-libs.spec           |  3 +++
 postgresql.changes             |  6 ++++++
 postgresql.spec                |  3 +++
 postgresql.spec.in             |  3 +++
 6 files changed, 44 insertions(+)
 create mode 100644 postgresql-9.0.4-perl514.patch

diff --git a/postgresql-9.0.4-perl514.patch b/postgresql-9.0.4-perl514.patch
new file mode 100644
index 0000000..22d9744
--- /dev/null
+++ b/postgresql-9.0.4-perl514.patch
@@ -0,0 +1,23 @@
+--- postgresql-9.0.4/src/pl/plperl/plperl.c	2011-04-15 05:15:53.000000000 +0200
++++ postgresql-9.0.4/src/pl/plperl/plperl.c	2011-05-25 10:01:08.543018259 +0200
+@@ -874,7 +874,7 @@
+ 		if (!isGV_with_GP(sv) || !GvCV(sv))
+ 			continue;
+ 		SvREFCNT_dec(GvCV(sv)); /* free the CV */
+-		GvCV(sv) = NULL;		/* prevent call via GV */
++		GvCV_set(sv, NULL);		/* prevent call via GV */
+ 	}
+ 	hv_clear(stash);
+ 
+--- postgresql-9.0.4/src/pl/plperl/plperl.h	2011-04-15 05:15:53.000000000 +0200
++++ postgresql-9.0.4/src/pl/plperl/plperl.h	2011-05-25 10:12:02.358018289 +0200
+@@ -53,6 +53,8 @@
+ void		plperl_spi_freeplan(char *);
+ void		plperl_spi_cursor_close(char *);
+ 
+-
++#ifndef GvCV_set
++#    define GvCV_set(gv, cv) (GvCV(gv)=(cv))
++#endif
+ 
+ #endif   /* PL_PERL_H */
diff --git a/postgresql-libs.changes b/postgresql-libs.changes
index 54fd776..ffdcfb0 100644
--- a/postgresql-libs.changes
+++ b/postgresql-libs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 25 08:06:44 UTC 2011 - idonmez@novell.com
+
+- Add postgresql-9.0.4-perl514.patch: For Perl 5.14 GvCV(sv) is no
+  longer an lvalue and needs to be replaced by GvCV_set(sv, value) 
+
 -------------------------------------------------------------------
 Thu Apr 21 10:06:45 UTC 2011 - max@novell.com
 
diff --git a/postgresql-libs.spec b/postgresql-libs.spec
index 0ee4e32..836b76a 100644
--- a/postgresql-libs.spec
+++ b/postgresql-libs.spec
@@ -45,6 +45,8 @@ Patch1:         postgresql-conf.patch
 Patch2:         postgresql-regress.patch
 Patch3:         postgresql-sle10-timestamptz.patch
 Patch4:         postgresql-plperl.patch
+# PATCH-FIX-UPSTREAM postgresql-9.0.4-perl514.patch idoenmez@suse.de -- Fix compilation with Perl 5.14
+Patch5:         postgresql-9.0.4-perl514.patch
 Url:            http://www.postgresql.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       postgresql = %pg_minor_version
@@ -123,6 +125,7 @@ which will interact with a PostgreSQL server.
 %patch3 -p1
 %endif
 %patch4
+%patch5 -p1
 
 %build
 export CFLAGS="%optflags $SP"
diff --git a/postgresql.changes b/postgresql.changes
index 54fd776..ffdcfb0 100644
--- a/postgresql.changes
+++ b/postgresql.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 25 08:06:44 UTC 2011 - idonmez@novell.com
+
+- Add postgresql-9.0.4-perl514.patch: For Perl 5.14 GvCV(sv) is no
+  longer an lvalue and needs to be replaced by GvCV_set(sv, value) 
+
 -------------------------------------------------------------------
 Thu Apr 21 10:06:45 UTC 2011 - max@novell.com
 
diff --git a/postgresql.spec b/postgresql.spec
index 721f224..c9893a6 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,6 +52,8 @@ Patch1:         postgresql-conf.patch
 Patch2:         postgresql-regress.patch
 Patch3:         postgresql-sle10-timestamptz.patch
 Patch4:         postgresql-plperl.patch
+# PATCH-FIX-UPSTREAM postgresql-9.0.4-perl514.patch idoenmez@suse.de -- Fix compilation with Perl 5.14
+Patch5:         postgresql-9.0.4-perl514.patch
 Url:            http://www.postgresql.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       postgresql = %pg_minor_version
@@ -245,6 +247,7 @@ and triggers.
 %patch3 -p1
 %endif
 %patch4
+%patch5 -p1
 
 %build
 export CFLAGS="%optflags $SP"
diff --git a/postgresql.spec.in b/postgresql.spec.in
index 837223c..1185fdf 100644
--- a/postgresql.spec.in
+++ b/postgresql.spec.in
@@ -54,6 +54,8 @@ Patch1:         postgresql-conf.patch
 Patch2:         postgresql-regress.patch
 Patch3:         postgresql-sle10-timestamptz.patch
 Patch4:         postgresql-plperl.patch
+# PATCH-FIX-UPSTREAM postgresql-9.0.4-perl514.patch idoenmez@suse.de -- Fix compilation with Perl 5.14
+Patch5:         postgresql-9.0.4-perl514.patch
 Url:            http://www.postgresql.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       postgresql = %pg_minor_version
@@ -251,6 +253,7 @@ FI_POSTGRES
 %patch3 -p1
 %endif
 %patch4
+%patch5 -p1
 
 %build
 export CFLAGS="%optflags $SP"