* [PR PATCH] phalcon 4.1.0 requires psr
@ 2020-11-01 12:20 betrixed
2020-11-02 16:34 ` Chocimier
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: betrixed @ 2020-11-01 12:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 707 bytes --]
There is a new 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: 2605 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] 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
+}
+
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: phalcon 4.1.0 requires psr
2020-11-01 12:20 [PR PATCH] phalcon 4.1.0 requires psr betrixed
@ 2020-11-02 16:34 ` Chocimier
2020-11-06 3:56 ` [PR PATCH] [Updated] " betrixed
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Chocimier @ 2020-11-02 16:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/26038#issuecomment-720582460
Comment:
Please make them more like `php-ast`: build_style instead of calling make in template, `php-devel` in both makedepends contexts for cross build. Setting build_wrksrc instead of srcpath may be needed.
Fix issues found by xlint. You can run it locally or look at travis job logs.
Fix typo in homepage.
Make one commit per template, titled as in contributing.md.
Declare variables in one block.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] phalcon 4.1.0 requires psr
2020-11-01 12:20 [PR PATCH] phalcon 4.1.0 requires psr betrixed
2020-11-02 16:34 ` Chocimier
@ 2020-11-06 3:56 ` betrixed
2020-11-06 7:56 ` betrixed
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: betrixed @ 2020-11-06 3:56 UTC (permalink / raw)
To: ml
[-- 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: 5596 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/2] 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/2] 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/"
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] phalcon 4.1.0 requires psr
2020-11-01 12:20 [PR PATCH] phalcon 4.1.0 requires psr betrixed
2020-11-02 16:34 ` Chocimier
2020-11-06 3:56 ` [PR PATCH] [Updated] " betrixed
@ 2020-11-06 7:56 ` betrixed
2020-11-06 8:03 ` betrixed
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: betrixed @ 2020-11-06 7:56 UTC (permalink / raw)
To: ml
[-- 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
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] phalcon 4.1.0 requires psr
2020-11-01 12:20 [PR PATCH] phalcon 4.1.0 requires psr betrixed
` (2 preceding siblings ...)
2020-11-06 7:56 ` betrixed
@ 2020-11-06 8:03 ` betrixed
2020-11-06 8:06 ` [PR PATCH] [Closed]: " betrixed
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: betrixed @ 2020-11-06 8:03 UTC (permalink / raw)
To: ml
[-- 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: 9134 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/5] 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/5] 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/5] 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
}
From 629cf41cdccde6a1a770140abfbacfeb80b24e78 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 4/5] sublime-text3: make it work
---
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
}
From ab2bfe6182bed880a59966bb332a8162a954ad3b Mon Sep 17 00:00:00 2001
From: Michael Rynn <michael.rynn.500@gmail.com>
Date: Fri, 6 Nov 2020 19:03:32 +1100
Subject: [PATCH 5/5] sublime-text3: revision 3
---
srcpkgs/sublime-text3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index b83eedbfee4..b7405b9069a 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=2
+revision=3
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>"
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Closed]: phalcon 4.1.0 requires psr
2020-11-01 12:20 [PR PATCH] phalcon 4.1.0 requires psr betrixed
` (3 preceding siblings ...)
2020-11-06 8:03 ` betrixed
@ 2020-11-06 8:06 ` betrixed
2020-11-06 11:41 ` betrixed
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: betrixed @ 2020-11-06 8:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
There's a closed pull request on the void-packages repository
phalcon 4.1.0 requires psr
https://github.com/void-linux/void-packages/pull/26038
Description:
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: phalcon 4.1.0 requires psr
2020-11-01 12:20 [PR PATCH] phalcon 4.1.0 requires psr betrixed
` (4 preceding siblings ...)
2020-11-06 8:06 ` [PR PATCH] [Closed]: " betrixed
@ 2020-11-06 11:41 ` betrixed
2020-11-06 11:41 ` [PR PATCH] [Updated] " betrixed
2020-11-06 11:50 ` [PR PATCH] [Closed]: " betrixed
7 siblings, 0 replies; 9+ messages in thread
From: betrixed @ 2020-11-06 11:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
New comment by betrixed on void-packages repository
https://github.com/void-linux/void-packages/pull/26038#issuecomment-723036127
Comment:
I have learnt a tiny bit more, cross-compiling stuff is out until I can do the easy stuff.
I adjusted these packages because I was previously using arch-linux. xbps seems to be a bigger more rigid beast. php-psr, php-phalcon are updated, and also this sublime-text3 package I found that did not package, (although I could have just stuffed it directly onto the system from the generic tar-ball, and not bothered with a package)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] phalcon 4.1.0 requires psr
2020-11-01 12:20 [PR PATCH] phalcon 4.1.0 requires psr betrixed
` (5 preceding siblings ...)
2020-11-06 11:41 ` betrixed
@ 2020-11-06 11:41 ` betrixed
2020-11-06 11:50 ` [PR PATCH] [Closed]: " betrixed
7 siblings, 0 replies; 9+ messages in thread
From: betrixed @ 2020-11-06 11:41 UTC (permalink / raw)
To: ml
[-- 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: 15240 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/8] 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/8] 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/8] 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
}
From 629cf41cdccde6a1a770140abfbacfeb80b24e78 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 4/8] sublime-text3: make it work
---
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
}
From ab2bfe6182bed880a59966bb332a8162a954ad3b Mon Sep 17 00:00:00 2001
From: Michael Rynn <michael.rynn.500@gmail.com>
Date: Fri, 6 Nov 2020 19:03:32 +1100
Subject: [PATCH 5/8] sublime-text3: revision 3
---
srcpkgs/sublime-text3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index b83eedbfee4..b7405b9069a 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=2
+revision=3
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>"
From 0e08873c1dc47c64360cd52c69b08b7f9f762a2b Mon Sep 17 00:00:00 2001
From: Michael Rynn <michael.rynn.500@gmail.com>
Date: Fri, 6 Nov 2020 21:02:21 +1100
Subject: [PATCH 6/8] php-psr: revision 5 package build_style
---
srcpkgs/php-psr/template | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/php-psr/template b/srcpkgs/php-psr/template
index 1ab78b19bf8..3e8fd9c6034 100644
--- a/srcpkgs/php-psr/template
+++ b/srcpkgs/php-psr/template
@@ -1,35 +1,37 @@
pkgname=php-psr
version=1.0.0
-revision=2
+revision=5
depends="php"
-makedepends="php-devel autoconf"
+build_wrksrc="$XBPS_BUILDDIR/${pkgname}-${version}"
+build_style=gnu-configure
+hostmakedepends="php-devel autoconf"
+makedepends="php-devel"
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"
+homepage="https://github.com/jbboehr/php-psr"
license="PHP-3.01"
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"
+inipath=/etc/php/conf.d
+
+pre_configure() {
+ phpize
+}
do_build() {
- cd ${wrksrc}/${srcpath}
- phpize
- ./configure
- make
+ make INSTALL_ROOT=${DESTDIR} install
}
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
+ cd ${build_wrksrc}
+ echo "extension=psr" > 01-psr.ini
+ vmkdir "${inipath}"
+ vinstall 01-psr.ini 644 "${inipath}"
}
+
From 1d83538eae132da55c63cff24d18d3d9ce78f62f Mon Sep 17 00:00:00 2001
From: Michael Rynn <michael.rynn.500@gmail.com>
Date: Fri, 6 Nov 2020 22:18:43 +1100
Subject: [PATCH 7/8] php-phalcon: build-style usage
---
srcpkgs/php-phalcon/template | 29 ++++++++++++++++-------------
srcpkgs/php-psr/template | 5 +++--
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/php-phalcon/template b/srcpkgs/php-phalcon/template
index 0cac4c6b4bf..d93dbafb5ca 100644
--- a/srcpkgs/php-phalcon/template
+++ b/srcpkgs/php-phalcon/template
@@ -1,9 +1,14 @@
pkgname=php-phalcon
version=4.1.0
-revision=2
+revision=3
depends="php php-psr"
-makedepends="php-devel autoconf"
+hostmakedepends="php-devel autoconf"
+makedepends="php-devel"
+wrksrc=cphalcon-${version}
+build_wrksrc="$XBPS_BUILDDIR/${wrksrc}/build/php7/64bits"
+build_style=gnu-configure
+
short_desc="php extension web framework written with zephir, C compiled"
distfiles=https://github.com/phalcon/cphalcon/archive/v${version}.zip
checksum=a3bb2a0a5d7e99f41021f017d6b0064fb981e4c954fe9ca07d52be01513ffede
@@ -12,27 +17,25 @@ license="PHP-3.01"
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
-do_build() {
+pre_configure() {
+ phpize
+ cd build
+ ../configure --prefix=/usr --enable-phalcon
+}
- export CPPFLAGS="-DPHALCON_RELEASE"
- cd ${wrksrc}/${srcpath}
- phpize
- cd build
- ../configure --prefix=/usr --enable-phalcon
- make
+do_build() {
+ cd ${build_wrksrc}/build
+ make INSTALL_ROOT=${DESTDIR} install
}
do_install() {
- cd ${wrksrc}/${srcpath}/build
+ cd "${build_wrksrc}/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
index 3e8fd9c6034..2ef4fa799d5 100644
--- a/srcpkgs/php-psr/template
+++ b/srcpkgs/php-psr/template
@@ -3,10 +3,11 @@ pkgname=php-psr
version=1.0.0
revision=5
depends="php"
-build_wrksrc="$XBPS_BUILDDIR/${pkgname}-${version}"
-build_style=gnu-configure
hostmakedepends="php-devel autoconf"
makedepends="php-devel"
+build_wrksrc="$XBPS_BUILDDIR/${pkgname}-${version}"
+build_style=gnu-configure
+
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
From 70de6f348ef8351759411c58552c7c83b7974cd3 Mon Sep 17 00:00:00 2001
From: Michael Rynn <michael.rynn.500@gmail.com>
Date: Fri, 6 Nov 2020 22:34:07 +1100
Subject: [PATCH 8/8] sublime-text3: revision 5
---
srcpkgs/sublime-text3/template | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index b7405b9069a..4680c069706 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=3
+revision=5
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>"
@@ -22,19 +22,18 @@ wrksrc="sublime_text_3"
nopie=yes
do_install() {
- #echo "DESTDIR is {$DESTDIR}"
- local slash2="//"
- local slash1="/"
- local dpath="${DESTDIR/$slash2/$slash1}"
- echo "dpath is {$dpath}"
+
+ #local slash2="//"
+ #local slash1="/"
+ #local dpath="${DESTDIR/$slash2/$slash1}"
+
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 -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
+ cp -P -r --preserve=mode ./* "$DESTDIR/opt/sublime_text/"
+ mkdir -p "${DESTDIR}/usr/bin"
+ ln -s "/opt/sublime_text/sublime_text" "$DESTDIR/usr/bin/subl3"
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Closed]: phalcon 4.1.0 requires psr
2020-11-01 12:20 [PR PATCH] phalcon 4.1.0 requires psr betrixed
` (6 preceding siblings ...)
2020-11-06 11:41 ` [PR PATCH] [Updated] " betrixed
@ 2020-11-06 11:50 ` betrixed
7 siblings, 0 replies; 9+ messages in thread
From: betrixed @ 2020-11-06 11:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
There's a closed pull request on the void-packages repository
phalcon 4.1.0 requires psr
https://github.com/void-linux/void-packages/pull/26038
Description:
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
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-11-06 11:50 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-01 12:20 [PR PATCH] phalcon 4.1.0 requires psr betrixed
2020-11-02 16:34 ` Chocimier
2020-11-06 3:56 ` [PR PATCH] [Updated] " betrixed
2020-11-06 7:56 ` betrixed
2020-11-06 8:03 ` betrixed
2020-11-06 8:06 ` [PR PATCH] [Closed]: " betrixed
2020-11-06 11:41 ` betrixed
2020-11-06 11:41 ` [PR PATCH] [Updated] " betrixed
2020-11-06 11:50 ` [PR PATCH] [Closed]: " betrixed
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).