[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 255a4c6a054881993f865be1b0e2420737c15c38
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Jun 13 15:59:26 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Jun 13 15:59:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255a4c6a
x11-misc/xplanet: unkeyword 1.3.1-r4
Signed-off-by: Arthur Zamarin gentoo.org>
x11-misc/xplanet/xplanet-1.3.1-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild
b/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild
index 41432bd1dc76..bdfc3659ceed 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 x86"
IUSE="gif jpeg png tiff truetype X"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 3bf968437b52d4dd00ffb2673badccc1a37e8c31
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Thu Jun 8 09:08:49 2023 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Tue Jun 13 14:15:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bf96843
x11-misc/xplanet: use HTTPS
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Bernard Cafarelli gentoo.org>
x11-misc/xplanet/xplanet-1.3.1-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild
b/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild
index b38aaede7811..a67050ecb3fa 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools flag-o-matic toolchain-funcs
DESCRIPTION="Render images of the earth into the X root window"
-HOMEPAGE="http://xplanet.sourceforge.net/;
+HOMEPAGE="https://xplanet.sourceforge.net/;
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 5f54501c6e147eddcf351e7bb9c4c52922b885df
Author: Sam James gentoo org>
AuthorDate: Fri Dec 16 01:33:21 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 16 01:38:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f54501c
x11-misc/xplanet: add media-libs/libtiff subslot dep
libtiff changed SONAME.
Signed-off-by: Sam James gentoo.org>
x11-misc/xplanet/{xplanet-1.3.1-r2.ebuild => xplanet-1.3.1-r4.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
b/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild
similarity index 95%
rename from x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
rename to x11-misc/xplanet/xplanet-1.3.1-r4.ebuild
index c557e893a087..b38aaede7811 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild
@@ -15,12 +15,12 @@ IUSE="gif jpeg png tiff truetype X"
RDEPEND="
gif? ( media-libs/giflib:= )
- jpeg? ( virtual/jpeg:0 )
+ jpeg? ( media-libs/libjpeg-turbo:= )
png? (
media-libs/libpng:0=
media-libs/netpbm
)
- tiff? ( media-libs/tiff:0 )
+ tiff? ( media-libs/tiff:= )
truetype? (
media-libs/freetype:2
x11-libs/pango
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 2c3486ba96b2d858a398274f56b862c2e04b78a9
Author: Sam James gentoo org>
AuthorDate: Sun Mar 20 00:13:47 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 20 00:13:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c3486ba
x11-misc/xplanet: [QA] fix tc-get* quoting
This can cause build problems for e.g. 32-bit (gcc -m32 ...)
Signed-off-by: Sam James gentoo.org>
x11-misc/xplanet/xplanet-1.3.1-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
b/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
index 581d092126e2..c557e893a087 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -69,5 +69,5 @@ src_configure() {
}
src_compile() {
- emake AR=$(tc-getAR)
+ emake AR="$(tc-getAR)"
}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 02a58b28e6fd37cba8f091cb027b618fc63aa61c Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Dec 21 08:48:21 2021 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Dec 21 08:48:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a58b28 x11-misc/xplanet: add myself to maintainers Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Bernard Cafarelli gentoo.org> x11-misc/xplanet/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x11-misc/xplanet/metadata.xml b/x11-misc/xplanet/metadata.xml index 15e6d93ab404..002d6c176524 100644 --- a/x11-misc/xplanet/metadata.xml +++ b/x11-misc/xplanet/metadata.xml @@ -1,7 +1,10 @@ https://www.gentoo.org/dtd/metadata.dtd;> - + + voyag...@gentoo.org + Bernard Cafarelli + xplanet
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/, x11-misc/xplanet/files/
commit: ce2c932b8a8af3e40d0ed68289b5b10525ef3668
Author: Bernard Cafarelli gentoo org>
AuthorDate: Tue Dec 21 09:10:23 2021 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Tue Dec 21 09:10:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce2c932b
x11-misc/xplanet: fix compilation with clang
Closes: https://bugs.gentoo.org/742761
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli gentoo.org>
.../files/xplanet-1.3.1-narrowing_conversion.patch | 87 ++
x11-misc/xplanet/xplanet-1.3.1-r2.ebuild | 1 +
2 files changed, 88 insertions(+)
diff --git a/x11-misc/xplanet/files/xplanet-1.3.1-narrowing_conversion.patch
b/x11-misc/xplanet/files/xplanet-1.3.1-narrowing_conversion.patch
new file mode 100644
index ..ebf090f30bcd
--- /dev/null
+++ b/x11-misc/xplanet/files/xplanet-1.3.1-narrowing_conversion.patch
@@ -0,0 +1,87 @@
+diff -Naur xplanet-1.3.1.orig/src/readConfig.cpp
xplanet-1.3.1/src/readConfig.cpp
+--- xplanet-1.3.1.orig/src/readConfig.cpp 2013-02-16 20:37:47.0
+0100
xplanet-1.3.1/src/readConfig.cpp 2021-12-21 10:06:22.434195435 +0100
+@@ -46,10 +46,10 @@
+ {
+ case ARC_COLOR:
+ {
+-int r, g, b;
+-if (sscanf(returnString, "%d,%d,%d", , , ) == 3)
++unsigned char r, g, b;
++if (sscanf(returnString, "%hhu,%hhu,%hhu", , , ) == 3)
+ {
+-unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
++unsigned char color[3] = { r, g, b };
+ currentProperties->ArcColor(color);
+ }
+ else
+@@ -176,10 +176,10 @@
+ break;
+ case COLOR:
+ {
+-int r, g, b;
+-if (sscanf(returnString, "%d,%d,%d", , , ) == 3)
++unsigned char r, g, b;
++if (sscanf(returnString, "%hhu,%hhu,%hhu", , , ) == 3)
+ {
+-unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
++unsigned char color[3] = { r, g, b };
+ currentProperties->Color(color);
+ }
+ else
+@@ -241,10 +241,10 @@
+ break;
+ case GRID_COLOR:
+ {
+-int r, g, b;
+-if (sscanf(returnString, "%d,%d,%d", , , ) == 3)
++unsigned char r, g, b;
++if (sscanf(returnString, "%hhu,%hhu,%hhu", , , ) == 3)
+ {
+-unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
++unsigned char color[3] = { r, g, b };
+ currentProperties->GridColor(color);
+ }
+ else
+@@ -293,10 +293,10 @@
+ break;
+ case MARKER_COLOR:
+ {
+-int r, g, b;
+-if (sscanf(returnString, "%d,%d,%d", , , ) == 3)
++unsigned char r, g, b;
++if (sscanf(returnString, "%hhu,%hhu,%hhu", , , ) == 3)
+ {
+-unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
++unsigned char color[3] = { r, g, b };
+ currentProperties->MarkerColor(color);
+ }
+ else
+@@ -400,10 +400,10 @@
+ break;
+ case ORBIT_COLOR:
+ {
+-int r, g, b;
+-if (sscanf(returnString, "%d,%d,%d", , , ) == 3)
++unsigned char r, g, b;
++if (sscanf(returnString, "%hhu,%hhu,%hhu", , , ) == 3)
+ {
+-unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
++unsigned char color[3] = { r, g, b };
+ currentProperties->OrbitColor(color);
+ }
+ else
+@@ -470,10 +470,10 @@
+ break;
+ case TEXT_COLOR:
+ {
+-int r, g, b;
+-if (sscanf(returnString, "%d,%d,%d", , , ) == 3)
++unsigned char r, g, b;
++if (sscanf(returnString, "%hhu,%hhu,%hhu", , , ) == 3)
+ {
+-unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
++unsigned char color[3] = { r, g, b };
+ currentProperties->TextColor(color);
+ }
+ else
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
b/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
index ac79390deb72..581d092126e2 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
@@ -40,6 +40,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-giflib.patch
+ "${FILESDIR}"/${P}-narrowing_conversion.patch
"${FILESDIR}"/${P}-remove-null-comparison.patch
"${FILESDIR}"/${P}-freetype_pkgconfig.patch #788136
)
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 2e19c9194cfa6ed199bc31345f8ea65ae166f1b4
Author: Matt Smith offtopica uk>
AuthorDate: Tue May 4 14:19:25 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue May 4 14:55:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e19c919
x11-misc/xplanet: Don't call AR directly
Closes: https://bugs.gentoo.org/726292
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Matt Smith offtopica.uk>
Closes: https://github.com/gentoo/gentoo/pull/20680
Signed-off-by: Lars Wendler gentoo.org>
x11-misc/xplanet/xplanet-1.3.1-r2.ebuild | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
b/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
index 1eef6008ea9..ac79390deb7 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic toolchain-funcs
DESCRIPTION="Render images of the earth into the X root window"
HOMEPAGE="http://xplanet.sourceforge.net/;
@@ -66,3 +66,7 @@ src_configure() {
)
econf --with-cspice=no "${myconf[@]}"
}
+
+src_compile() {
+ emake AR=$(tc-getAR)
+}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 7e4891d682041caf0e92e1a4b8c408f3ed0bceb8
Author: Lars Wendler gentoo org>
AuthorDate: Tue May 4 13:36:40 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue May 4 13:36:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4891d6
x11-misc/xplanet: Really do the revbump this time
Bug: https://bugs.gentoo.org/788136
Signed-off-by: Lars Wendler gentoo.org>
x11-misc/xplanet/{xplanet-1.3.1-r1.ebuild => xplanet-1.3.1-r2.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
b/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
similarity index 100%
rename from x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
rename to x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/files/, x11-misc/xplanet/
commit: 17d912ff9ad0a450e9250e8224866ca172926b60
Author: Lars Wendler gentoo org>
AuthorDate: Tue May 4 13:25:36 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue May 4 13:35:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17d912ff
x11-misc/xplanet: Revbump to fix freetype detection
Bumped to EAPI-7
Overhauled src_configure function
Closes: https://bugs.gentoo.org/788136
Signed-off-by: Lars Wendler gentoo.org>
.../files/xplanet-1.3.1-freetype_pkgconfig.patch | 40 +++
x11-misc/xplanet/xplanet-1.3.1-r1.ebuild | 57 +-
2 files changed, 63 insertions(+), 34 deletions(-)
diff --git a/x11-misc/xplanet/files/xplanet-1.3.1-freetype_pkgconfig.patch
b/x11-misc/xplanet/files/xplanet-1.3.1-freetype_pkgconfig.patch
new file mode 100644
index 000..534a32e9ef7
--- /dev/null
+++ b/x11-misc/xplanet/files/xplanet-1.3.1-freetype_pkgconfig.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/788136
+
+--- xplanet-1.3.1/acinclude.m4
xplanet-1.3.1/acinclude.m4
+@@ -48,23 +48,22 @@
+
+ AC_DEFUN([AC_FIND_FREETYPE],
+ [
+-
++PKG_PROG_PKG_CONFIG
+ AC_ARG_WITH(freetype,AC_HELP_STRING([--with-freetype],[Enable Freetype
support for TrueType fonts (YES)]))
+
+ have_freetype='no'
+-if test "$with_freetype" != 'no'; then
+- AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+- if test "$FREETYPE_CONFIG" = no; then
+-AC_MSG_WARN(*** Xplanet will be built without freetype support ***)
+- else
+-FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags` -I`$FREETYPE_CONFIG
--prefix`/include"
+-FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
+-AC_SUBST(FREETYPE_CFLAGS)
+-AC_SUBST(FREETYPE_LIBS)
+-AC_DEFINE(HAVE_LIBFREETYPE,,Define if you have freetype)
++AS_IF([test "$with_freetype" != 'no'], [
++ PKG_CHECK_MODULES([FREETYPE], [freetype2], [
++AC_DEFINE([HAVE_LIBFREETYPE],,[Define if you have freetype])
+ have_freetype='yes'
+- fi
+-fi
++ ], [
++AS_IF([test "$with_freetype" != 'yes'], [
++ AC_MSG_WARN(*** Xplanet will be built without freetype support ***)
++], [
++ AC_MSG_ERROR(*** freetype support requested but not found ***)
++])
++ ])
++])
+ ])
+
+ AC_DEFUN([AC_FIND_PANGO],
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
index 7fd20ea87c2..1eef6008ea9 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit flag-o-matic
+EAPI=7
+inherit autotools flag-o-matic
DESCRIPTION="Render images of the earth into the X root window"
HOMEPAGE="http://xplanet.sourceforge.net/;
@@ -32,8 +32,8 @@ RDEPEND="
x11-libs/libXt
)
"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
truetype? ( virtual/pkgconfig )
X? ( x11-base/xorg-proto )
"
@@ -41,39 +41,28 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${P}-giflib.patch
"${FILESDIR}"/${P}-remove-null-comparison.patch
+ "${FILESDIR}"/${P}-freetype_pkgconfig.patch #788136
)
+src_prepare() {
+ default
+ eautoreconf #788136
+}
+
src_configure() {
# econf says 'checking pnm.h presence... no'
use png && append-cppflags -I"${EPREFIX}"/usr/include/netpbm
- local myconf=()
-
- use X \
- && myconf+=( --with-x --with-xscreensaver ) \
- || myconf+=( --with-x=no --with-xscreensaver=no )
-
- use gif \
- && myconf+=( --with-gif ) \
- || myconf+=( --with-gif=no )
-
- use jpeg \
- && myconf+=( --with-jpeg ) \
- || myconf+=( --with-jpeg=no )
-
- use tiff \
- && myconf+=( --with-tiff ) \
- || myconf+=( --with-tiff=no )
-
- use png \
- && myconf+=( --with-png --with-pnm ) \
- || myconf+=( --with-png=no --with-pnm=no )
-
- use truetype \
- && myconf+=( --with-freetype --with-pango ) \
- || myconf+=( --with-freetype=no --with-pango=no )
-
- econf \
- --with-cspice=no \
- "${myconf[@]}"
+ local myconf=(
+ --with-freetype$(usex truetype '' '=no')
+ --with-gif$(usex gif '' '=no')
+ --with-jpeg$(usex jpeg '' '=no')
+ --with-pango$(usex truetype '' '=no')
+ --with-png$(usex png '' '=no')
+ --with-pnm$(usex png '' '=no')
+ --with-tiff$(usex tiff '' '=no')
+ --with-x$(usex X '' '=no')
+ --with-xscreensaver$(usex X '' '=no')
+ )
+ econf --with-cspice=no "${myconf[@]}"
}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 382552cbc52ec8f03ba3b1d70f4b265b8c7e5d69 Author: Jonas Stein gentoo org> AuthorDate: Wed Apr 7 23:59:55 2021 + Commit: Jonas Stein gentoo org> CommitDate: Wed Apr 7 23:59:55 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=382552cb x11-misc/xplanet: drop project desktop-misc Drop project desktop-misc from the list of maintainers. Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Jonas Stein gentoo.org> x11-misc/xplanet/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/x11-misc/xplanet/metadata.xml b/x11-misc/xplanet/metadata.xml index 6037d71217b..ec991c30505 100644 --- a/x11-misc/xplanet/metadata.xml +++ b/x11-misc/xplanet/metadata.xml @@ -1,10 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - desktop-m...@gentoo.org - Gentoo Desktop Miscellaneous Project - + xplanet
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 84071cdc3666039fa5287004709f9bb814a69f7a
Author: Harri Nieminen gmail com>
AuthorDate: Tue Mar 28 18:33:12 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Apr 1 10:23:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84071cdc
x11-misc/xplanet: Remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4319
x11-misc/xplanet/Manifest | 1 -
x11-misc/xplanet/xplanet-1.3.0.ebuild | 75 ---
2 files changed, 76 deletions(-)
diff --git a/x11-misc/xplanet/Manifest b/x11-misc/xplanet/Manifest
index 0382efbfec5..5c8163e01da 100644
--- a/x11-misc/xplanet/Manifest
+++ b/x11-misc/xplanet/Manifest
@@ -1,2 +1 @@
-DIST xplanet-1.3.0.tar.gz 1227385 SHA256
44fb742bb93e5661ea8b11ccabcc12896693e051f3dd5083c9227224c416b442 SHA512
c9f0db21c457d0702f8b1fb6d632838f45e80ea45b9cade80d6ab0ae956fdca03cfeed9582548c69b349a354afc27308309656d7e06ac46bc416c3e1038f8efd
WHIRLPOOL
e4fe013eeef4868d28f8a53c194f54865dd4cf29137936eb609352fba4a3481e0a6db9664944cb67d9e7896b150b5e640c95136e6b9f33dc4810591316d0371a
DIST xplanet-1.3.1.tar.gz 1236035 SHA256
4380d570a8bf27b81fb629c97a636c1673407f4ac4989ce931720078a90aece7 SHA512
06ce3187fbd364f4ccee768fceca559690c905c870e2fb25ca32453ce09c564ba3455ec539f1e3da177de23a0611f767b375efe2e10b601d09313c0d068e35e0
WHIRLPOOL
4c40fac4056654aa195f9955053d2dfba6791e8e2021673f05c334163ee5b1d842e6101447228844573ed41a88f37c0fd96df633716bddeb55c8940941621ad9
diff --git a/x11-misc/xplanet/xplanet-1.3.0.ebuild
b/x11-misc/xplanet/xplanet-1.3.0.ebuild
deleted file mode 100644
index 9d1eed6bb69..000
--- a/x11-misc/xplanet/xplanet-1.3.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit base flag-o-matic
-
-DESCRIPTION="Render images of the earth into the X root window"
-HOMEPAGE="http://xplanet.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="gif jpeg png tiff truetype X"
-
-RDEPEND="gif? (
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: d8eee05f47838797b331f7299bc91a662b951f4c
Author: Michael Weber gentoo org>
AuthorDate: Tue Mar 21 15:34:03 2017 +
Commit: Michael Weber gentoo org>
CommitDate: Wed Mar 22 07:29:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8eee05f
x11-misc/xplanet: ppc stable (bug 613104)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="amd64 arm arm64 ppc ppc64"
x11-misc/xplanet/xplanet-1.3.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
index 0e5f45ddb19..c469ef0208a 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
IUSE="gif jpeg png tiff truetype X"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 6755d753e3d9506fc4577659fdc2227b538a238a
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Mar 21 14:32:38 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Mar 21 14:32:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6755d753
x11-misc/xplanet: x86 stable wrt bug #613104
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/xplanet/xplanet-1.3.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
index 1b4439962ca..0e5f45ddb19 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86"
IUSE="gif jpeg png tiff truetype X"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 1cbfb09b89ec7e7d4b8fbf433a4a6827e1f0d19c
Author: Michael Weber gentoo org>
AuthorDate: Tue Mar 21 10:05:08 2017 +
Commit: Michael Weber gentoo org>
CommitDate: Tue Mar 21 10:08:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cbfb09b
x11-misc/xplanet: ppc64 stable (bug 613104)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="amd64 arm arm64 ppc ppc64"
x11-misc/xplanet/xplanet-1.3.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
index 940bc90bc71..1b4439962ca 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc ~x86"
IUSE="gif jpeg png tiff truetype X"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 3e5e1d81c236ce2dd7442608afaa793d97839007
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Mar 20 11:03:41 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Mar 20 11:03:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5e1d81
x11-misc/xplanet: amd64 stable wrt bug #613104
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/xplanet/xplanet-1.3.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
index ea225747e55..940bc90bc71 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="gif jpeg png tiff truetype X"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 54c623a505f0513a84311efb557a622505bded5a
Author: Harri Nieminen gmail com>
AuthorDate: Mon Mar 6 15:24:23 2017 +
Commit: David Seifert gentoo org>
CommitDate: Tue Mar 7 09:12:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c623a5
x11-misc/xplanet: Remove old
Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4142
x11-misc/xplanet/xplanet-1.3.1.ebuild | 83 ---
1 file changed, 83 deletions(-)
diff --git a/x11-misc/xplanet/xplanet-1.3.1.ebuild
b/x11-misc/xplanet/xplanet-1.3.1.ebuild
deleted file mode 100644
index e858bbc0a61..000
--- a/x11-misc/xplanet/xplanet-1.3.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic
-
-DESCRIPTION="Render images of the earth into the X root window"
-HOMEPAGE="http://xplanet.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gif jpeg png tiff truetype X"
-
-RDEPEND="
- gif? ( media-libs/giflib:= )
- jpeg? ( virtual/jpeg:* )
- png? (
- media-libs/libpng:0
- media-libs/netpbm
- )
- tiff? ( media-libs/tiff:0 )
- truetype? (
- media-libs/freetype:2
- x11-libs/pango
- )
- X? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXext
- x11-libs/libXt
- )
-"
-DEPEND="
- ${RDEPEND}
- truetype? ( virtual/pkgconfig )
- X? (
- x11-proto/scrnsaverproto
- x11-proto/xproto
- )
-"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-giflib.patch
-}
-
-src_configure() {
- # econf says 'checking pnm.h presence... no'
- use png && append-cppflags -I/usr/include/netpbm
-
- local myconf
-
- use X \
- && myconf+=" --with-x --with-xscreensaver" \
- || myconf+=" --with-x=no --with-xscreensaver=no"
-
- use gif \
- && myconf+=" --with-gif" \
- || myconf+=" --with-gif=no"
-
- use jpeg \
- && myconf+=" --with-jpeg" \
- || myconf+=" --with-jpeg=no"
-
- use tiff \
- && myconf+=" --with-tiff" \
- || myconf+=" --with-tiff=no"
-
- use png \
- && myconf+=" --with-png --with-pnm" \
- || myconf+=" --with-png=no --with-pnm=no"
-
- use truetype \
- && myconf+=" --with-freetype --with-pango" \
- || myconf+=" --with-freetype=no --with-pango=no"
-
- econf \
- --with-cspice=no \
- ${myconf}
-}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/files/, x11-misc/xplanet/
commit: 4a6c36cea73fe40cf56d73505c347d56d1663d33
Author: Harri Nieminen gmail com>
AuthorDate: Sat Feb 25 08:52:06 2017 +
Commit: David Seifert gentoo org>
CommitDate: Tue Feb 28 19:10:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a6c36ce
x11-misc/xplanet: Fix build with gcc6, bug #594804
Gentoo-Bug: https://bugs.gentoo.org/594804
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4085
.../xplanet-1.3.1-remove-null-comparison.patch | 157 +
x11-misc/xplanet/xplanet-1.3.1-r1.ebuild | 83 +++
2 files changed, 240 insertions(+)
diff --git a/x11-misc/xplanet/files/xplanet-1.3.1-remove-null-comparison.patch
b/x11-misc/xplanet/files/xplanet-1.3.1-remove-null-comparison.patch
new file mode 100644
index 00..3ead8872e0
--- /dev/null
+++ b/x11-misc/xplanet/files/xplanet-1.3.1-remove-null-comparison.patch
@@ -0,0 +1,157 @@
+Index: src/libannotate/addArcs.cpp
+===
+diff --git a/src/libannotate/addArcs.cpp b/src/libannotate/addArcs.cpp
+--- a/src/libannotate/addArcs.cpp (revision 206)
b/src/libannotate/addArcs.cpp (revision 207)
+@@ -258,7 +258,7 @@
+ {
+ ifstream inFile(arcFile.c_str());
+ char *line = new char[MAX_LINE_LENGTH];
+-while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
+ readArcFile(line, planet, view, projection,
+ planetProperties, annotationMap);
+
+@@ -292,7 +292,7 @@
+ {
+ ifstream inFile(arcFile.c_str());
+ char *line = new char[256];
+-while (inFile.getline (line, 256, '\n') != NULL)
++while (inFile.getline (line, 256, '\n'))
+ readArcFile(line, NULL, view, NULL, NULL, annotationMap);
+
+ inFile.close();
+Index: src/libannotate/addMarkers.cpp
+===
+diff --git a/src/libannotate/addMarkers.cpp b/src/libannotate/addMarkers.cpp
+--- a/src/libannotate/addMarkers.cpp (revision 206)
b/src/libannotate/addMarkers.cpp (revision 207)
+@@ -429,7 +429,7 @@
+ {
+ ifstream inFile(markerFile.c_str());
+ char *line = new char[MAX_LINE_LENGTH];
+-while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
+ {
+ unsigned char color[3];
+ memcpy(color, planetProperties->MarkerColor(), 3);
+@@ -475,7 +475,7 @@
+ {
+ ifstream inFile(markerFile.c_str());
+ char *line = new char[MAX_LINE_LENGTH];
+-while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
+ {
+ unsigned char color[3];
+ memcpy(color, options->Color(), 3);
+Index: src/libannotate/addSatellites.cpp
+===
+diff --git a/src/libannotate/addSatellites.cpp
b/src/libannotate/addSatellites.cpp
+--- a/src/libannotate/addSatellites.cpp(revision 206)
b/src/libannotate/addSatellites.cpp(revision 207)
+@@ -488,10 +488,10 @@
+ {
+ ifstream inFile(tleFile.c_str());
+ char lines[3][80];
+-while (inFile.getline(lines[0], 80) != NULL)
++while (inFile.getline(lines[0], 80))
+ {
+-if ((inFile.getline(lines[1], 80) == NULL)
+-|| (inFile.getline(lines[2], 80) == NULL))
++if ((!inFile.getline(lines[1], 80))
++|| (!inFile.getline(lines[2], 80)))
+ {
+ ostringstream errStr;
+ errStr << "Malformed TLE file (" << tleFile << ")?\n";
+@@ -542,7 +542,7 @@
+ {
+ ifstream inFile(satFile.c_str());
+ char *line = new char[MAX_LINE_LENGTH];
+-while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
+ readSatelliteFile(line, planet, view, projection,
+ planetProperties, annotationMap);
+
+Index: src/libannotate/addSpiceObjects.cpp
+===
+diff --git a/src/libannotate/addSpiceObjects.cpp
b/src/libannotate/addSpiceObjects.cpp
+--- a/src/libannotate/addSpiceObjects.cpp (revision 206)
b/src/libannotate/addSpiceObjects.cpp (revision 207)
+@@ -524,7 +524,7 @@
+ {
+ ifstream inFile(kernelFile.c_str());
+ char *line = new char[MAX_LINE_LENGTH];
+-while
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: f8b77a4533531263a115602819ef5875e07eb3f1
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Apr 17 07:43:50 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Apr 17 07:45:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8b77a45
x11-misc/xplanet: Fix media-libs/giflib dependency.
Package-Manager: portage-2.2.28
x11-misc/xplanet/xplanet-1.3.1.ebuild | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/x11-misc/xplanet/xplanet-1.3.1.ebuild
b/x11-misc/xplanet/xplanet-1.3.1.ebuild
index 21cd769..6f421b0 100644
--- a/x11-misc/xplanet/xplanet-1.3.1.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1.ebuild
@@ -14,7 +14,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="gif jpeg png tiff truetype X"
-RDEPEND="gif? ( >media-libs/giflib-4.2 )
+RDEPEND="
+ gif? ( media-libs/giflib:= )
jpeg? ( virtual/jpeg:* )
png? (
media-libs/libpng:0
@@ -27,16 +28,19 @@ RDEPEND="gif? ( >media-libs/giflib-4.2 )
)
X? (
x11-libs/libX11
- x11-libs/libXext
x11-libs/libXScrnSaver
+ x11-libs/libXext
x11-libs/libXt
- )"
-DEPEND="${RDEPEND}
+ )
+"
+DEPEND="
+ ${RDEPEND}
truetype? ( virtual/pkgconfig )
X? (
x11-proto/scrnsaverproto
x11-proto/xproto
- )"
+ )
+"
DOCS="AUTHORS ChangeLog NEWS README TODO"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/, x11-misc/xplanet/files/
commit: f1fc7bdbb2ed98129536359ffa9e88331728513e
Author: Jeroen Roovers gentoo org>
AuthorDate: Mon Apr 11 05:40:42 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Mon Apr 11 05:41:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1fc7bdb
x11-misc/xplanet: Old.
Package-Manager: portage-2.2.28
x11-misc/xplanet/files/xplanet-1.3.0-giflib.patch | 741 --
x11-misc/xplanet/xplanet-1.3.0-r1.ebuild | 78 ---
2 files changed, 819 deletions(-)
diff --git a/x11-misc/xplanet/files/xplanet-1.3.0-giflib.patch
b/x11-misc/xplanet/files/xplanet-1.3.0-giflib.patch
deleted file mode 100644
index 193719e..000
--- a/x11-misc/xplanet/files/xplanet-1.3.0-giflib.patch
+++ /dev/null
@@ -1,741 +0,0 @@
-Fixes from upstream SVN, to support giflib-4.2 and giflib-5.
-
-Index: src/libimage/gif.c
-===
src/libimage/gif.c (revision 184)
-+++ src/libimage/gif.c (revision 186)
-@@ -20,222 +20,581 @@
-
- #include
- #include
-+#include
-
- #include
-
- /*
-- A lot of this is based on the gif2rgb and rgb2gif codes in the libungif
-- distribution.
-+ Based on the gif2rgb and rgb2gif codes in the libgif distribution.
- */
-
- int
- read_gif(const char *filename, int *width, int *height, unsigned char **rgb)
- {
--int interlace_offset[] = { 0, 4, 2, 1 };
--int interlace_jump[] = { 8, 8, 4, 2 };
--GifColorType *colormap;
--GifFileType *infile;
--GifRecordType record_type;
--GifRowType *buffer = NULL;
-+int BackGround = 0;
-+/* The way Interlaced image should be read - offsets and
-+ jumps... */
-+int InterlacedOffset[] = { 0, 4, 2, 1 };
-+int InterlacedJumps[] = { 8, 8, 4, 2 };
-+ColorMapObject *ColorMap;
-
--int i, j;
--int color_index;
--unsigned char *ptr = NULL;
-+int i, j, Size, Row, Col, Width, Height, ExtCode, Count;
-+GifRecordType RecordType;
-+GifByteType *Extension;
-+GifRowType *ScreenBuffer;
-
--infile = DGifOpenFileName(filename);
-+GifRowType GifRow;
-+GifColorType *ColorMapEntry;
-+unsigned char *BufferP;
-
--if (infile == NULL)
-+GifFileType *GifFile;
-+#if GIFLIB_MAJOR >= 5
-+GifFile = DGifOpenFileName(filename, NULL);
-+#else
-+GifFile = DGifOpenFileName(filename);
-+#endif
-+if (GifFile == NULL) {
-+ fprintf(stderr, "Can't open GIF file %s\n", filename);
-+ return(0);
-+}
-+/* (Following comment was probably written on a 286 running under DOS.)
*/
-+/* Allocate the screen as vector of column of rows. We can't allocate
the*/
-+/* whole screen at once, as this broken minded CPU can allocate up to
*/
-+/* 64k at a time and our image can be bigger than that:*/
-+/* Note this screen is device independent - it's the screen defined by
*/
-+/* the GIF file parameters.
*/
-+if ((ScreenBuffer = (GifRowType *)
-+ malloc(GifFile->SHeight * sizeof(GifRowType))) == NULL)
- {
--PrintGifError();
--return(0);
-+ fprintf(stderr, "Failed to allocate memory required, aborted.");
-+ return(0);
- }
-
--do
-+Size = GifFile->SWidth * sizeof(GifPixelType);/* Size in bytes one row.*/
-+if ((ScreenBuffer[0] = (GifRowType) malloc(Size)) == NULL) /* First row.
*/
- {
--if (DGifGetRecordType(infile, _type) == GIF_ERROR)
--{
--PrintGifError();
--return(0);
-+ fprintf(stderr, "Failed to allocate memory required, aborted.");
-+ return(0);
-+}
-+
-+for (i = 0; i < GifFile->SWidth; i++) /* Set its color to BackGround. */
-+ ScreenBuffer[0][i] = GifFile->SBackGroundColor;
-+for (i = 1; i < GifFile->SHeight; i++) {
-+ /* Allocate the other rows, and set their color to background too: */
-+ if ((ScreenBuffer[i] = (GifRowType) malloc(Size)) == NULL)
-+ {
-+ fprintf(stderr, "Failed to allocate memory required, aborted.\n");
-+ return(0);
-+ }
-+
-+ memcpy(ScreenBuffer[i], ScreenBuffer[0], Size);
-+}
-+
-+/* Scan the content of the GIF file and load the image(s) in: */
-+do {
-+ if (DGifGetRecordType(GifFile, ) == GIF_ERROR) {
-+ fprintf(stderr, "Can't read GIF file\n");
-+ return(0);
-+ }
-+ switch (RecordType) {
-+ case IMAGE_DESC_RECORD_TYPE:
-+ if (DGifGetImageDesc(GifFile) == GIF_ERROR) {
-+ return(0);
-+ }
-+ Row = GifFile->Image.Top; /* Image Position relative to Screen. */
-+ Col = GifFile->Image.Left;
-+ Width = GifFile->Image.Width;
-+ Height = GifFile->Image.Height;
-+ if (GifFile->Image.Left + GifFile->Image.Width > GifFile->SWidth ||
-+ GifFile->Image.Top + GifFile->Image.Height > GifFile->SHeight) {
-+ return(0);
-+
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: fc70b3bb0f1192217431a06c046aad3a43cd4e9e Author: Jeroen Roovers gentoo org> AuthorDate: Mon Apr 11 05:39:11 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Mon Apr 11 05:41:13 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc70b3bb x11-misc/xplanet: Set SLOT dep. Package-Manager: portage-2.2.28 x11-misc/xplanet/xplanet-1.3.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xplanet/xplanet-1.3.1.ebuild b/x11-misc/xplanet/xplanet-1.3.1.ebuild index aeb8456..21cd769 100644 --- a/x11-misc/xplanet/xplanet-1.3.1.ebuild +++ b/x11-misc/xplanet/xplanet-1.3.1.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="gif jpeg png tiff truetype X" RDEPEND="gif? ( >media-libs/giflib-4.2 ) - jpeg? ( virtual/jpeg ) + jpeg? ( virtual/jpeg:* ) png? ( media-libs/libpng:0 media-libs/netpbm
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/files/, x11-misc/xplanet/
commit: a6f240d87f47be9607a24c31d5867cd87487e533
Author: Jeroen Roovers gentoo org>
AuthorDate: Mon Apr 11 05:30:56 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Mon Apr 11 05:41:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6f240d8
x11-misc/xplanet: Version bump.
Package-Manager: portage-2.2.28
x11-misc/xplanet/Manifest | 1 +
x11-misc/xplanet/files/xplanet-1.3.1-giflib.patch | 55
x11-misc/xplanet/xplanet-1.3.1.ebuild | 78 +++
3 files changed, 134 insertions(+)
diff --git a/x11-misc/xplanet/Manifest b/x11-misc/xplanet/Manifest
index d52d658..0382efb 100644
--- a/x11-misc/xplanet/Manifest
+++ b/x11-misc/xplanet/Manifest
@@ -1 +1,2 @@
DIST xplanet-1.3.0.tar.gz 1227385 SHA256
44fb742bb93e5661ea8b11ccabcc12896693e051f3dd5083c9227224c416b442 SHA512
c9f0db21c457d0702f8b1fb6d632838f45e80ea45b9cade80d6ab0ae956fdca03cfeed9582548c69b349a354afc27308309656d7e06ac46bc416c3e1038f8efd
WHIRLPOOL
e4fe013eeef4868d28f8a53c194f54865dd4cf29137936eb609352fba4a3481e0a6db9664944cb67d9e7896b150b5e640c95136e6b9f33dc4810591316d0371a
+DIST xplanet-1.3.1.tar.gz 1236035 SHA256
4380d570a8bf27b81fb629c97a636c1673407f4ac4989ce931720078a90aece7 SHA512
06ce3187fbd364f4ccee768fceca559690c905c870e2fb25ca32453ce09c564ba3455ec539f1e3da177de23a0611f767b375efe2e10b601d09313c0d068e35e0
WHIRLPOOL
4c40fac4056654aa195f9955053d2dfba6791e8e2021673f05c334163ee5b1d842e6101447228844573ed41a88f37c0fd96df633716bddeb55c8940941621ad9
diff --git a/x11-misc/xplanet/files/xplanet-1.3.1-giflib.patch
b/x11-misc/xplanet/files/xplanet-1.3.1-giflib.patch
new file mode 100644
index 000..b4d6fb9
--- /dev/null
+++ b/x11-misc/xplanet/files/xplanet-1.3.1-giflib.patch
@@ -0,0 +1,55 @@
+--- a/src/libimage/gif.c
b/src/libimage/gif.c
+@@ -20,6 +20,7 @@
+
+ #include
+ #include
++#include
+ #include
+
+ #include
+@@ -179,7 +180,11 @@
+ }
+ }
+
++#if GIFLIB_MAJOR >= 5
++if (DGifCloseFile(GifFile, NULL) == GIF_ERROR) {
++#else
+ if (DGifCloseFile(GifFile) == GIF_ERROR) {
++#endif
+ return(0);
+ }
+
+@@ -240,7 +245,7 @@
+ * Also non of the parameter are allocated by this routine.
+ * This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
+
**/
+-static int
++int
+ QuantizeBuffer(unsigned int Width,
+unsigned int Height,
+int *ColorMapSize,
+@@ -493,7 +498,11 @@
+ static void QuitGifError(GifFileType *GifFile)
+ {
+ fprintf(stderr, "Error writing GIF file\n");
++#if GIFLIB_MAJOR >= 5
++if (GifFile != NULL) EGifCloseFile(GifFile, NULL);
++#else
+ if (GifFile != NULL) EGifCloseFile(GifFile);
++#endif
+ }
+
+ int
+@@ -589,7 +598,11 @@
+ Ptr += width;
+ }
+
++#if GIFLIB_MAJOR >= 5
++if (EGifCloseFile(GifFile, NULL) == GIF_ERROR)
++#else
+ if (EGifCloseFile(GifFile) == GIF_ERROR)
++#endif
+
+ {
+ QuitGifError(GifFile);
diff --git a/x11-misc/xplanet/xplanet-1.3.1.ebuild
b/x11-misc/xplanet/xplanet-1.3.1.ebuild
new file mode 100644
index 000..726ebc0
--- /dev/null
+++ b/x11-misc/xplanet/xplanet-1.3.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit base flag-o-matic
+
+DESCRIPTION="Render images of the earth into the X root window"
+HOMEPAGE="http://xplanet.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gif jpeg png tiff truetype X"
+
+RDEPEND="gif? ( >media-libs/giflib-4.2 )
+ jpeg? ( virtual/jpeg )
+ png? (
+ media-libs/libpng:0
+ media-libs/netpbm
+ )
+ tiff? ( media-libs/tiff:0 )
+ truetype? (
+ media-libs/freetype:2
+ x11-libs/pango
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXScrnSaver
+ x11-libs/libXt
+ )"
+DEPEND="${RDEPEND}
+ truetype? ( virtual/pkgconfig )
+ X? (
+ x11-proto/scrnsaverproto
+ x11-proto/xproto
+ )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+PATCHES=( "${FILESDIR}"/${P}-giflib.patch )
+
+src_configure() {
+ # econf says 'checking pnm.h presence... no'
+ use png && append-cppflags -I/usr/include/netpbm
+
+ local myconf
+
+ use X \
+ && myconf+=" --with-x --with-xscreensaver" \
+ || myconf+=" --with-x=no --with-xscreensaver=no"
+
+ use gif \
+ && myconf+=" --with-gif" \
+ || myconf+=" --with-gif=no"
+
+ use jpeg \
+ && myconf+=" --with-jpeg" \
+ || myconf+=" --with-jpeg=no"
+
+ use tiff \
+
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 8b70cd3b2b31a0b79a2c2aee34b44145403972c2
Author: Jeroen Roovers gentoo org>
AuthorDate: Mon Apr 11 05:37:14 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Mon Apr 11 05:41:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b70cd3b
x11-misc/xplanet: Drop base.eclass.
Package-Manager: portage-2.2.28
x11-misc/xplanet/xplanet-1.3.1.ebuild | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/x11-misc/xplanet/xplanet-1.3.1.ebuild
b/x11-misc/xplanet/xplanet-1.3.1.ebuild
index 726ebc0..aeb8456 100644
--- a/x11-misc/xplanet/xplanet-1.3.1.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit base flag-o-matic
+inherit eutils flag-o-matic
DESCRIPTION="Render images of the earth into the X root window"
HOMEPAGE="http://xplanet.sourceforge.net/;
@@ -40,7 +40,9 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog NEWS README TODO"
-PATCHES=( "${FILESDIR}"/${P}-giflib.patch )
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-giflib.patch
+}
src_configure() {
# econf says 'checking pnm.h presence... no'
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xplanet/
commit: 12290dff3e82ce831ec857b4116e2049dd64a5b6
Author: Manuel Rüger gentoo org>
AuthorDate: Thu Nov 12 22:20:23 2015 +
Commit: Manuel Rüger gentoo org>
CommitDate: Thu Nov 12 22:20:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12290dff
x11-misc/xplanet: Remove old
Package-Manager: portage-2.2.24
x11-misc/xplanet/Manifest | 1 -
x11-misc/xplanet/xplanet-1.2.2.ebuild | 66 ---
2 files changed, 67 deletions(-)
diff --git a/x11-misc/xplanet/Manifest b/x11-misc/xplanet/Manifest
index a78d4c3..d52d658 100644
--- a/x11-misc/xplanet/Manifest
+++ b/x11-misc/xplanet/Manifest
@@ -1,2 +1 @@
-DIST xplanet-1.2.2.tar.gz 1217169 SHA256
6f8f8c59b4d5d1dd5018ed4b1367e55f6296f0253596b7705f714a9b3ccdd3ca SHA512
1a5dbad62b79adce28239615e3a2fd00300fca085f9400f2735c5dc015f06c63e182ed0d78399324bf6049374f2c034e6026a4054f26c34e11024b956695a53f
WHIRLPOOL
155f436b339e345dadabbf618d79ee6ee39ea039d51c245523e7e2fdd3c50e5148c10f25c75c1b287558ada1baf2ddbbf5a3a67deec543dcaa6239d47a6b93c1
DIST xplanet-1.3.0.tar.gz 1227385 SHA256
44fb742bb93e5661ea8b11ccabcc12896693e051f3dd5083c9227224c416b442 SHA512
c9f0db21c457d0702f8b1fb6d632838f45e80ea45b9cade80d6ab0ae956fdca03cfeed9582548c69b349a354afc27308309656d7e06ac46bc416c3e1038f8efd
WHIRLPOOL
e4fe013eeef4868d28f8a53c194f54865dd4cf29137936eb609352fba4a3481e0a6db9664944cb67d9e7896b150b5e640c95136e6b9f33dc4810591316d0371a
diff --git a/x11-misc/xplanet/xplanet-1.2.2.ebuild
b/x11-misc/xplanet/xplanet-1.2.2.ebuild
deleted file mode 100644
index de8744f..000
--- a/x11-misc/xplanet/xplanet-1.2.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="Render images of the earth into the X root window"
-HOMEPAGE="http://xplanet.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="gif jpeg X truetype tiff png"
-
-RDEPEND="
- X? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXScrnSaver
- x11-libs/libXt )
- gif? ( media-libs/giflib )
- jpeg? ( virtual/jpeg )
- png? (
- media-libs/libpng:0
- media-libs/netpbm )
- tiff? ( media-libs/tiff:0 )
- truetype? (
- media-libs/freetype:2
- x11-libs/pango )"
-DEPEND="${RDEPEND}
- X? (
- x11-proto/xproto
- x11-proto/scrnsaverproto )"
-
-src_configure() {
- local myconf
-
- use X \
- && myconf="${myconf} --with-x --with-xscreensaver" \
- || myconf="${myconf} --with-x=no --with-xscreensaver=no"
-
- use gif \
- && myconf="${myconf} --with-gif" \
- || myconf="${myconf} --with-gif=no"
-
- use jpeg \
- && myconf="${myconf} --with-jpeg" \
- || myconf="${myconf} --with-jpeg=no"
-
- use tiff \
- && myconf="${myconf} --with-tiff" \
- || myconf="${myconf} --with-tiff=no"
-
- use png \
- && myconf="${myconf} --with-png --with-pnm" \
- || myconf="${myconf} --with-png=no --with-pnm=no"
-
- use truetype \
- && myconf="${myconf} --with-freetype --with-pango" \
- || myconf="${myconf} --with-freetype=no --with-pango=no"
-
- econf \
- --with-cspice=no \
- ${myconf}
-}
