[PR PATCH] emacs: new package for pgtk

[PR PATCH] emacs: new package for pgtk

[sgn]

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

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages emacs-pgtk
https://github.com/void-linux/void-packages/pull/45373

emacs: new package for pgtk
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR:**briefly**

<--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 92ec8a4bcb4fbca7e4b635cfb4185db7163d612b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 1 Aug 2023 22:14:33 +0700
Subject: [PATCH] emacs: new package for pgtk

---
 srcpkgs/emacs-pgtk     |  1 +
 srcpkgs/emacs/template | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/emacs-pgtk

diff --git a/srcpkgs/emacs-pgtk b/srcpkgs/emacs-pgtk
new file mode 120000
index 0000000000000..a7642dd168d67
--- /dev/null
+++ b/srcpkgs/emacs-pgtk
@@ -0,0 +1 @@
+emacs
\ No newline at end of file
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 1124bd4da106d..2375cbd25e807 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,7 +1,7 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=29.0.92
-revision=1
+revision=2
 create_wrksrc=required
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
@@ -56,6 +56,7 @@ post_extract() {
 	cp -a emacs-* nox
 	cp -a emacs-* x11
 	cp -a emacs-* gtk3
+	cp -a emacs-* pgtk
 }
 
 do_configure() {
@@ -70,12 +71,16 @@ do_configure() {
 
 	cd $wrksrc/gtk3
 	./configure --with-x-toolkit=gtk3 --with-xwidgets ${configure_args}
+
+	cd $wrksrc/pgtk
+	./configure --with-pgtk ${configure_args}
 }
 
 do_build() {
 	make ${makejobs} -C nox
 	make ${makejobs} -C x11
 	make ${makejobs} -C gtk3
+	make ${makejobs} -C pgtk
 }
 
 do_install() {
@@ -124,3 +129,16 @@ emacs-gtk3_package() {
 		rm -rf ${PKGDESTDIR}/usr/lib/systemd
 	}
 }
+
+emacs-pgtk_package() {
+	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
+	provides="emacs-${version}_${revision}"
+	replaces="emacs>=0"
+	short_desc+=" - Pure GTK version"
+	pkg_install() {
+		make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/pgtk install
+		rm -f ${PKGDESTDIR}/usr/bin/ctags
+		rm -rf ${PKGDESTDIR}/usr/share/{emacs,man,info}
+		rm -rf ${PKGDESTDIR}/usr/lib/systemd
+	}
+}

Re: emacs: new package for pgtk

[icp1994]

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

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/45373#issuecomment-1660653374

Comment:
Works fine for me :+1: 

Re: emacs: new package for pgtk

[bmp]

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

New comment by bmp on void-packages repository

https://github.com/void-linux/void-packages/pull/45373#issuecomment-1660677110

Comment:
Works for me too!

Re: emacs: new package for pgtk

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/45373#issuecomment-1661405587

Comment:
emacs 29.1 is out, we may package that instead.

Re: emacs: new package for pgtk

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/45373#issuecomment-1662731616

Comment:
Please rebase.

Re: [PR PATCH] [Updated] emacs: new package for pgtk

[sgn]

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

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

https://github.com/sgn/void-packages emacs-pgtk
https://github.com/void-linux/void-packages/pull/45373

emacs: new package for pgtk
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR:**briefly**

<--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From de5a2ab1907702c3d485171eff20b2c64a32a2df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 1 Aug 2023 22:14:33 +0700
Subject: [PATCH] emacs: new package for pgtk

---
 srcpkgs/emacs-pgtk     |  1 +
 srcpkgs/emacs/template | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/emacs-pgtk

diff --git a/srcpkgs/emacs-pgtk b/srcpkgs/emacs-pgtk
new file mode 120000
index 0000000000000..a7642dd168d67
--- /dev/null
+++ b/srcpkgs/emacs-pgtk
@@ -0,0 +1 @@
+emacs
\ No newline at end of file
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index c9f62eb8ebf64..047d05e034383 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,7 +1,7 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=29.1
-revision=1
+revision=2
 create_wrksrc=required
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
@@ -56,6 +56,7 @@ post_extract() {
 	cp -a emacs-* nox
 	cp -a emacs-* x11
 	cp -a emacs-* gtk3
+	cp -a emacs-* pgtk
 }
 
 do_configure() {
@@ -70,12 +71,16 @@ do_configure() {
 
 	cd $wrksrc/gtk3
 	./configure --with-x-toolkit=gtk3 --with-xwidgets ${configure_args}
+
+	cd $wrksrc/pgtk
+	./configure --with-pgtk ${configure_args}
 }
 
 do_build() {
 	make ${makejobs} -C nox
 	make ${makejobs} -C x11
 	make ${makejobs} -C gtk3
+	make ${makejobs} -C pgtk
 }
 
 do_install() {
@@ -124,3 +129,16 @@ emacs-gtk3_package() {
 		rm -rf ${PKGDESTDIR}/usr/lib/systemd
 	}
 }
+
+emacs-pgtk_package() {
+	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
+	provides="emacs-${version}_${revision}"
+	replaces="emacs>=0"
+	short_desc+=" - Pure GTK version"
+	pkg_install() {
+		make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/pgtk install
+		rm -f ${PKGDESTDIR}/usr/bin/ctags
+		rm -rf ${PKGDESTDIR}/usr/share/{emacs,man,info}
+		rm -rf ${PKGDESTDIR}/usr/lib/systemd
+	}
+}

Re: [PR PATCH] [Merged]: emacs: new package for pgtk

[sgn]

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

There's a merged pull request on the void-packages repository

emacs: new package for pgtk
https://github.com/void-linux/void-packages/pull/45373

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR:**briefly**

<--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Re: emacs: new package for pgtk

[tomekw]

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

New comment by tomekw on void-packages repository

https://github.com/void-linux/void-packages/pull/45373#issuecomment-1697114956

Comment:
I've tried updating from `emacs-gtk3` (28) to `emacs-pgtk` and now I'm getting:

```
$ emacs
Warning: arch-independent data dir '/usr/share/emacs/29.1/etc/': No such file or directory
Warning: Lisp directory '/usr/share/emacs/29.1/lisp': No such file or directory
Error: /usr/share/emacs/29.1/etc/charsets: No such file or directory
Emacs will not function correctly without the character map files.
Please check your installation!
```

Did you experience something like that as well?

Re: emacs: new package for pgtk

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/45373#issuecomment-1697515263

Comment:
No, of course, those files are provided by `emacs-common` packages, which is dependencies of `emacs-pgtk`.
Your installation are broken. I think. Output of: `xbps-pkgdb -a`?

Re: emacs: new package for pgtk

[tomekw]

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

New comment by tomekw on void-packages repository

https://github.com/void-linux/void-packages/pull/45373#issuecomment-1697525719

Comment:
That's it!

```
ERROR: emacs-pgtk: dependency not satisfied: emacs-common-29.1_2
```

I had `emacs-gtk3` on hold (28.2_2) because I want to use Doom Emacs. Once it has become compatible with 29, I've "unpinnned" it, switching from `emacs-gtk3` to `emacs-pgtk`. `emacs-common` stayed pinned to `28.2_2`.

Now it works. Thanks!