Github messages for voidlinux
 help / color / mirror / Atom feed
From: AlexDltg <AlexDltg@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] intellij-idea-community-edition: update to 2021.1.1.
Date: Mon, 03 May 2021 12:19:25 +0200
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30639@inbox.vuxu.org> (raw)

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

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

https://github.com/AlexDltg/void-packages patch-1
https://github.com/void-linux/void-packages/pull/30639

intellij-idea-community-edition: update to 2021.1.1.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR


<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/30639.patch is attached

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

From 0a3b628c17c5fc8edd33dae6dce8f4bf75dc0fec Mon Sep 17 00:00:00 2001
From: Alex <60660439+AlexDltg@users.noreply.github.com>
Date: Mon, 3 May 2021 12:17:40 +0200
Subject: [PATCH] intellij-idea-community-edition: update to 2021.1.1.

---
 .../intellij-idea-community-edition/template  | 96 +++++++++++--------
 1 file changed, 54 insertions(+), 42 deletions(-)

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index 460f8429da73..add2eb063e3e 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,66 +1,78 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2021.1
+version=2021.1.1
 revision=1
 archs="i686 x86_64"
+wrksrc="idea-IC-211.7142.45"
 depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
 short_desc="Java integrated development environment by JetBrains"
 maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0"
-homepage="https://www.jetbrains.org/"
+homepage="https://www.jetbrains.org/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jbr.tar.gz"
-checksum=becd31e78d430db7a3edf381343f6722926e6e16b35d39371b74786decc40617
+checksum=19ffcfedad31cec173d1c3a82e7d07e758d7637c8d4941a0d8599b7ef01896ce
 repository=nonfree
 nopie=yes
+# JetBrains' tools are self-sufficient and while they include code that appears to be linked to libs from other packages, these libs are either included in the tool package, or the code works by looking for one of several supported libs.
+noverifyrdeps=yes
 python_version=3
-skiprdeps="/usr/lib/intellij-idea/plugins/Kotlin/bin/linux/LLDBFrontend"
 
 post_extract() {
-	mv $XBPS_BUILDDIR/idea-IC-* ${wrksrc}
+	# Remove files for other OSes
+	rm -rf plugins/webp/lib/libwebp/win
+	rm -rf plugins/webp/lib/libwebp/mac
+	rm -rf plugins/maven/lib/maven3/lib/jansi-native/osx
+	rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows32
+	rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows64
+	rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd64
+	rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd32
+
+	# Remove files for other CPU architectures
+	rm -rf lib/pty4j-native/linux/ppc64le
+	rm -rf lib/pty4j-native/linux/aarch64
+	rm -rf lib/pty4j-native/linux/mips64el
+
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64)
+			rm -rf bin/fsnotifier
+			rm -rf bin/idea.vmoptions
+			rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
+			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux32
+			;;
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/idea64.vmoptions
+			rm -rf bin/libdbm64.so
+			rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
+			rm -rf lib/pty4j-native/linux/x86_64
+			rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux64
+			;;
+	esac
 }
 
 do_install() {
+	TARGET_PATH="usr/lib/${pkgname}"
+
 	vmkdir usr/bin
-	vmkdir usr/share/doc/intellij-idea
-	vmkdir usr/lib/intellij-idea
+	vmkdir ${TARGET_PATH}
+	vmkdir usr/share/licenses/${pkgname}
 	vmkdir usr/share/pixmaps
 	vmkdir usr/share/icons/hicolor/scalable/apps
 
-	mv bin lib plugins redist product-info.json build.txt  ${DESTDIR}/usr/lib/intellij-idea
-	mv LICENSE.txt NOTICE.txt license ${DESTDIR}/usr/share/doc/intellij-idea
-	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/win -rf
-	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/mac -rf
-	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/windows32 -rf
-	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/windows64 -rf
-	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/osx -rf
-	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/freebsd32 -rf
-	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/freebsd64 -rf
-	case $XBPS_TARGET_MACHINE in
-		x86_64)
-		rm ${DESTDIR}/usr/lib/intellij-idea/bin/fsnotifier
-		rm ${DESTDIR}/usr/lib/intellij-idea/bin/idea.vmoptions
-		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/x86 -rf
-		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/aarch64 -rf
-		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/mips64el -rf
-		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/ppc64le -rf
-		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/webp/lib/libwebp/linux/libwebp_jni.so
-		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/linux32 -rf
-		;;
-		i686)
-		rm ${DESTDIR}/usr/lib/intellij-idea/bin/fsnotifier64
-		rm ${DESTDIR}/usr/lib/intellij-idea/bin/idea64.vmoptions
-		rm ${DESTDIR}/usr/lib/intellij-idea/bin/libdbm64.so
-		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/x86_64 -rf
-		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/aarch64 -rf
-		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/mips64el -rf
-		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/ppc64le -rf
-		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/webp/lib/libwebp/linux/libwebp_jni64.so
-		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/linux64 -rf
-		;;
-	esac
+	# Ideally vlicense should be called here, but vcopy is more terse.
+	vcopy license/* usr/share/licenses/${pkgname}
+
+	vcopy bin ${TARGET_PATH}
+	vcopy lib ${TARGET_PATH}
+	vcopy plugins ${TARGET_PATH}
+	vcopy redist ${TARGET_PATH}
+	vcopy product-info.json ${TARGET_PATH}
+	vcopy build.txt ${TARGET_PATH}
+
+	ln -sf /${TARGET_PATH}/bin/idea.sh ${DESTDIR}/usr/bin/idea
+	ln -sf /${TARGET_PATH}/bin/idea.png ${DESTDIR}/usr/share/pixmaps
+	ln -sf /${TARGET_PATH}/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps
 
-	ln -sf /usr/lib/intellij-idea/bin/idea.sh ${DESTDIR}/usr/bin/idea
-	ln -sf /usr/lib/intellij-idea/bin/idea.png ${DESTDIR}/usr/share/pixmaps
-	ln -sf /usr/lib/intellij-idea/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps
 	vinstall ${FILESDIR}/idea.desktop 644 usr/share/applications
 }

             reply	other threads:[~2021-05-03 10:19 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-03 10:19 AlexDltg [this message]
2021-05-03 10:30 ` AlexDltg
2021-05-03 10:34 ` AlexDltg
2021-05-03 10:54 ` AlexDltg
2021-05-03 10:55 ` AlexDltg
2021-05-03 10:56 ` AlexDltg
2021-05-03 11:40 ` AlexDltg
2021-05-04 12:14 ` [PR REVIEW] " ericonr
2021-06-15 10:56 ` Dko1905

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-30639@inbox.vuxu.org \
    --to=alexdltg@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

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git