[packages/php-xhp] up to 1.4; supports php 5.5

[glen]

commit 63bc4ce62f67a24aaaa548eb2d86281502b19554
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Oct 5 21:18:00 2013 +0300

    up to 1.4; supports php 5.5

 optflags.patch | 24 ++++++++++++++++++------
 php-xhp.spec   | 13 ++++++-------
 2 files changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/php-xhp.spec b/php-xhp.spec
index e3dfe59..78e1d77 100644
--- a/php-xhp.spec
+++ b/php-xhp.spec
@@ -12,12 +12,12 @@
 %define		modname	xhp
 Summary:	Inline XML For PHP
 Name:		php-%{modname}
-Version:	1.3.9
-Release:	10
+Version:	1.4
+Release:	1
 License:	PHP 3.01
 Group:		Development/Languages/PHP
-Source0:	http://github.com/facebook/xhp/tarball/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	38cab2551dc3a4e1bc5a68d2be39e64a
+Source0:	https://github.com/facebook/xhp/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	98d56ee6b5bc22f76be4106a224c5875
 URL:		http://github.com/facebook/xhp/wiki
 Patch0:		optflags.patch
 %{?with_tests:BuildRequires:	/usr/bin/php}
@@ -54,8 +54,7 @@ Requires:	php-devel >= 4:5.2.0
 Header files for xhp.
 
 %prep
-%setup -qc
-mv facebook-%{modname}-*/* .
+%setup -q -n %{modname}-%{version}
 %patch0 -p1
 
 %ifarch alpha sparc ppc
@@ -130,5 +129,5 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/xhp_preprocess.hpp
-#%{_libdir}/libxhp.so
+%{_libdir}/libxhp.so
 %{_libdir}/libxhp.a
diff --git a/optflags.patch b/optflags.patch
index 78d81b5..ff03e21 100644
--- a/optflags.patch
+++ b/optflags.patch
@@ -1,6 +1,7 @@
---- php-xhp-1.3.9/xhp/Makefile~	2010-05-28 14:06:59.000000000 +0300
-+++ php-xhp-1.3.9/xhp/Makefile	2010-10-31 15:05:15.465496881 +0200
-@@ -1,7 +1,9 @@
+--- xhp-1.4/xhp/Makefile~	2013-10-05 21:12:10.000000000 +0300
++++ xhp-1.4/xhp/Makefile	2013-10-05 21:13:14.761834909 +0300
+@@ -1,7 +1,10 @@
++CXX = g++
 +OPTFLAGS = -Wall -O3 
 +
  ifdef DEBUG
@@ -11,12 +12,23 @@
  endif
  
  ifdef PROFILE
-@@ -38,7 +40,7 @@
- 	$(AR) -crs $@ $^
+@@ -28,7 +31,7 @@
+ 	re2c -c -o $@ $<
+ 
+ %.o: %.cpp
+-	g++ -c $(CPPFLAGS) -o $@ $<
++	$(CXX) -c $(CPPFLAGS) -o $@ $<
+ 
+ xhp_preprocess.o: xhp_preprocess.cpp scanner.lex.hpp parser.yacc.hpp
+ parser.yacc.o: scanner.lex.hpp
+@@ -39,8 +42,8 @@
  
  libxhp.so: code_rope.o scanner.lex.o parser.yacc.o fastpath.o xhp_preprocess.o
 -	g++ -shared -Wl,-soname,libxhp.so -o libxhp.so $^
 +	$(CXX) -shared -Wl,-soname,libxhp.so -o libxhp.so $^
  
  xhpize: xhpize.cpp libxhp.a
- 	$(CXX) $(CPPFLAGS) -o $@ $^
+-	g++ $(CPPFLAGS) -o $@ $^
++	$(CXX) $(CPPFLAGS) -o $@ $^
+ 
+ .PHONY: all clean tags
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-xhp.git/commitdiff/63bc4ce62f67a24aaaa548eb2d86281502b19554