From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] emacs-gtk2: remove package
Date: Thu, 31 Mar 2022 20:16:06 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36432@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages emacs-gtk2
https://github.com/void-linux/void-packages/pull/36432
emacs-gtk2: remove package
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36432.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-emacs-gtk2-36432.patch --]
[-- Type: text/x-diff, Size: 2969 bytes --]
From 80b05d8e9affd13de8fe92ffa45eb46d0aeea8bc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 20:14:50 +0200
Subject: [PATCH] emacs-gtk2: remove package
---
srcpkgs/emacs-gtk2 | 1 -
srcpkgs/emacs/template | 20 +-------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 2 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/emacs-gtk2
diff --git a/srcpkgs/emacs-gtk2 b/srcpkgs/emacs-gtk2
deleted file mode 120000
index a7642dd168d6..000000000000
--- a/srcpkgs/emacs-gtk2
+++ /dev/null
@@ -1 +0,0 @@
-emacs
\ No newline at end of file
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 1cd4d18bd6aa..9c4405ffc88e 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -9,7 +9,7 @@ configure_args="--with-file-notification=inotify --with-modules
$(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)
$(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)"
hostmakedepends="pkg-config tar"
-makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel
+makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel
dbus-devel acl-devel
$(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if tiff tiff-devel)
$(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) $(vopt_if xpm libXpm-devel)
@@ -41,7 +41,6 @@ pre_configure() {
mkdir -p nox
mv * nox || true
cp -a nox x11
- cp -a nox gtk2
cp -a nox gtk3
}
@@ -54,9 +53,6 @@ do_configure() {
$(vopt_with dbus) --without-gconf --without-gsettings \
${configure_args}
- cd $wrksrc/gtk2
- ./configure --with-x-toolkit=gtk2 ${configure_args}
-
cd $wrksrc/gtk3
./configure --with-x-toolkit=gtk3 --with-xwidgets ${configure_args}
}
@@ -64,7 +60,6 @@ do_configure() {
do_build() {
make ${makejobs} -C nox
make ${makejobs} -C x11
- make ${makejobs} -C gtk2
make ${makejobs} -C gtk3
}
@@ -101,19 +96,6 @@ emacs-x11_package() {
}
}
-emacs-gtk2_package() {
- depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
- provides="emacs-${version}_${revision}"
- replaces="emacs>=0"
- short_desc+=" - GTK+2 version"
- pkg_install() {
- make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/gtk2 install
- rm -f ${PKGDESTDIR}/usr/bin/ctags
- rm -rf ${PKGDESTDIR}/usr/share/{emacs,man,info}
- rm -rf ${PKGDESTDIR}/usr/lib
- }
-}
-
emacs-gtk3_package() {
depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
provides="emacs-${version}_${revision}"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df264c9d7501..d5a5e66b8b1a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -68,6 +68,7 @@ replaces="
eclipse-ecj<=4.9_3
electron7<=7.3.3_1
electron9<=9.4.1_1
+ emacs-gtk2<=27.2_1
enventor<=1.0.0_2
epstopdf<=2.27_3
flickcurl-devel<=1.26_4
next reply other threads:[~2022-03-31 18:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-31 18:16 paper42 [this message]
2022-04-02 10:01 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36432@inbox.vuxu.org \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).