Re: [PR PATCH] [Updated] phalcon 4.1.0 requires psr

[betrixed <betrixed@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 712 bytes --]

There is an updated pull request by betrixed against master on the void-packages repository

https://github.com/betrixed/void-packages master
https://github.com/void-linux/void-packages/pull/26038

phalcon 4.1.0 requires psr
xbps-src built templates to add Phalcon  php extension.  php 7.4.
Extra extensions for package  php. Build uses php-devel for toll phpize  
only tested on current php 7.4.11
Package template files for
php-psr -  interface definitions from PHP-FIG, prequisite for phalcon extension.
php-phalcon - version 4.1.0 (latest) compiled website framework, using generated C-source from zephir tool


A patch file from https://github.com/void-linux/void-packages/pull/26038.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-26038.patch --]
[-- Type: text/x-diff, Size: 6977 bytes --]

From 9e75a7e1543e1e388ba83c1bce9a209559e3f4b0 Mon Sep 17 00:00:00 2001
From: Michael Rynn <michael.rynn.500@gmail.com>
Date: Sun, 1 Nov 2020 23:08:26 +1100
Subject: [PATCH 1/3] phalcon 4.1.0 requires psr

---
 srcpkgs/php-phalcon/template | 37 ++++++++++++++++++++++++++++++++++++
 srcpkgs/php-psr/template     | 34 +++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 srcpkgs/php-phalcon/template
 create mode 100644 srcpkgs/php-psr/template

diff --git a/srcpkgs/php-phalcon/template b/srcpkgs/php-phalcon/template
new file mode 100644
index 00000000000..947fb24d850
--- /dev/null
+++ b/srcpkgs/php-phalcon/template
@@ -0,0 +1,37 @@
+
+pkgname=php-phalcon
+version=4.1.0
+revision=1
+depends="php php-psr"
+makedepends="php-devel autoconf"
+short_desc="php extension web framework written with zephir, C compiled"
+distfiles=https://github.com/phalcon/cphalcon/archive/v${version}.zip
+checksum=a3bb2a0a5d7e99f41021f017d6b0064fb981e4c954fe9ca07d52be01513ffede
+homepage="https://https://phalcon.io/"
+license="PHP-3.01"
+maintainer="Michael Rynn <michael.rynn.500@gmail.com>"
+
+lib32disabled=yes
+create_wrksrc=yes
+
+srcpath=cphalcon-${version}/build/php7/64bits
+inipath=/etc/php/conf.d
+
+do_build() {  
+
+  export CPPFLAGS="-DPHALCON_RELEASE"
+  cd ${wrksrc}/${srcpath}
+  phpize
+  cd build
+  ../configure --prefix=/usr --enable-phalcon
+  make
+}
+
+do_install() {
+  cd ${wrksrc}/${srcpath}/build
+  echo 'extension=phalcon' > phalcon.ini
+  vmkdir ${inipath}
+  vinstall phalcon.ini 644 ${inipath}
+  vinstall modules/phalcon.so 755 /usr/lib/php/modules
+}
+
diff --git a/srcpkgs/php-psr/template b/srcpkgs/php-psr/template
new file mode 100644
index 00000000000..7407bfc7476
--- /dev/null
+++ b/srcpkgs/php-psr/template
@@ -0,0 +1,34 @@
+
+pkgname=php-psr
+version=1.0.0
+revision=1
+depends="php"
+makedepends="php-devel autoconf"
+short_desc="php PSR standards from PHP-FIG group, required by php-phalcon"
+distfiles=https://github.com/jbboehr/php-psr/archive/v${version}.zip
+checksum=4f1aa75d0feb0172acc728844fe35d3e67f3de8b486d14802ef1a3719a0d8956
+homepage="https://github.com/jbboehr/php-psr#readme"
+license="PHP-3.01"
+maintainer="Michael Rynn <michael.rynn.500@gmail.com>"
+
+lib32disabled=yes
+create_wrksrc=yes
+
+srcpath=php-psr-${version}
+inipath="/etc/php/conf.d"
+
+do_build() {  
+  cd ${wrksrc}/${srcpath}
+  phpize
+  ./configure
+  make
+}
+
+do_install() {
+  cd ${wrksrc}/${srcpath}
+  echo "extension=psr" > 01-psr.ini
+  vmkdir ${inipath}
+  vinstall 01-psr.ini 644 ${inipath}
+  vinstall modules/psr.so 755 /usr/lib/php/modules
+}
+

From b9959eff6dac0acf4a2d60fe4c793198993bb539 Mon Sep 17 00:00:00 2001
From: Michael Rynn <michael.rynn.500@gmail.com>
Date: Fri, 6 Nov 2020 14:53:39 +1100
Subject: [PATCH 2/3] php-psr: add archs only x86_64 php-phalcon: add archs
 only x86_64 sublime-text3: make it work

---
 srcpkgs/php-phalcon/template   |  3 ++-
 srcpkgs/php-psr/template       |  3 ++-
 srcpkgs/sublime-text3/template | 15 ++++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/php-phalcon/template b/srcpkgs/php-phalcon/template
index 947fb24d850..0cac4c6b4bf 100644
--- a/srcpkgs/php-phalcon/template
+++ b/srcpkgs/php-phalcon/template
@@ -1,7 +1,7 @@
 
 pkgname=php-phalcon
 version=4.1.0
-revision=1
+revision=2
 depends="php php-psr"
 makedepends="php-devel autoconf"
 short_desc="php extension web framework written with zephir, C compiled"
@@ -13,6 +13,7 @@ maintainer="Michael Rynn <michael.rynn.500@gmail.com>"
 
 lib32disabled=yes
 create_wrksrc=yes
+archs="x86_64"
 
 srcpath=cphalcon-${version}/build/php7/64bits
 inipath=/etc/php/conf.d
diff --git a/srcpkgs/php-psr/template b/srcpkgs/php-psr/template
index 7407bfc7476..1ab78b19bf8 100644
--- a/srcpkgs/php-psr/template
+++ b/srcpkgs/php-psr/template
@@ -1,7 +1,7 @@
 
 pkgname=php-psr
 version=1.0.0
-revision=1
+revision=2
 depends="php"
 makedepends="php-devel autoconf"
 short_desc="php PSR standards from PHP-FIG group, required by php-phalcon"
@@ -13,6 +13,7 @@ maintainer="Michael Rynn <michael.rynn.500@gmail.com>"
 
 lib32disabled=yes
 create_wrksrc=yes
+archs="x86_64"
 
 srcpath=php-psr-${version}
 inipath="/etc/php/conf.d"
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index e87de887ad0..51b43f39914 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,7 +1,7 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=1
+revision=2
 depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
 short_desc="Sophisticated text editor for code, markup and prose"
 maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
@@ -20,15 +20,16 @@ repository="nonfree"
 archs="i686 x86_64"
 wrksrc="sublime_text_3"
 nopie=yes
+alternatives="
+ subl:subl:/opt/sublime_text/sublime_text"
 
 do_install() {
-	vmkdir "usr/bin"
-	vmkdir "usr/share/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/share/sublime_text"
-	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
+ 	vmkdir "usr/bin"
+	vmkdir "opt/sublime_text"
+	vinstall "sublime_text.desktop" 644 "usr/share/applications"
 	for size in 128 16 256 32 48; do
 		vinstall "Icon/${size}x${size}/sublime-text.png" 644 "usr/share/icons/hicolor/${size}x${size}/apps/"
 	done
-	ln -s /usr/share/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	sed -i 's:Exec=/opt/sublime_text/:Exec=/usr/share/sublime_text/:' ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	rm -f -R ./Icon
+	cp -P --preserve=links,mode -r ./* "${DESTDIR}/opt/sublime_text/"
 }

From c0119522b822fb53f1cf047f01f77de655590a8b Mon Sep 17 00:00:00 2001
From: Michael Rynn <michael.rynn.500@gmail.com>
Date: Fri, 6 Nov 2020 18:55:29 +1100
Subject: [PATCH 3/3] sublime-text3: update add link

---
 srcpkgs/sublime-text3/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index 51b43f39914..b83eedbfee4 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -20,16 +20,21 @@ repository="nonfree"
 archs="i686 x86_64"
 wrksrc="sublime_text_3"
 nopie=yes
-alternatives="
- subl:subl:/opt/sublime_text/sublime_text"
 
 do_install() {
- 	vmkdir "usr/bin"
+	#echo "DESTDIR is {$DESTDIR}"
+	local slash2="//"
+	local slash1="/"
+	local dpath="${DESTDIR/$slash2/$slash1}"
+	echo "dpath is {$dpath}"
 	vmkdir "opt/sublime_text"
 	vinstall "sublime_text.desktop" 644 "usr/share/applications"
 	for size in 128 16 256 32 48; do
 		vinstall "Icon/${size}x${size}/sublime-text.png" 644 "usr/share/icons/hicolor/${size}x${size}/apps/"
 	done
 	rm -f -R ./Icon
-	cp -P --preserve=links,mode -r ./* "${DESTDIR}/opt/sublime_text/"
+	cp -P -r --preserve=mode ./* "$dpath/opt/sublime_text/"
+	mkdir -p ${dpath}/usr/bin
+	ln -s "/opt/sublime_text/sublime_text" "$dpath/usr/bin/subl3"
+	#ln -s /opt/sublime_text/sublime_text ${DESDIR}/usr/bin/subl3
 }