* [gentoo-commits] repo/gentoo:master commit in: x11-misc/tint2/files/, x11-misc/tint2/
@ 2018-12-25 21:21 Amy Liffey
0 siblings, 0 replies; 4+ messages in thread
From: Amy Liffey @ 2018-12-25 21:21 UTC (permalink / raw
To: gentoo-commits
commit: 3a99da8be98adaf1d5ba5360da18da3834b91be5
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 21:08:58 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 21:21:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a99da8b
x11-misc/tint2: remove old versions 0.12 - 16.1
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
x11-misc/tint2/Manifest | 4 --
.../0.12.12-fix-compilation-without-svg.patch | 18 ------
.../0.12.12-no-hardcode-update-icon-cache.patch | 34 -----------
.../tint2/files/0.12.12-relax-pango-includes.patch | 26 ---------
x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch | 12 ----
x11-misc/tint2/tint2-0.12.12.ebuild | 65 ----------------------
x11-misc/tint2/tint2-0.14.6-r2.ebuild | 63 ---------------------
x11-misc/tint2/tint2-15.3.ebuild | 60 --------------------
x11-misc/tint2/tint2-16.1.ebuild | 60 --------------------
9 files changed, 342 deletions(-)
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 6995713920a..ae9affc21a6 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1,7 +1,3 @@
-DIST tint2-0.12.12.tar.gz 469724 BLAKE2B cfb9eb702680e23f7f9c9b98c8853d1e059a4d189347496eaa9e667bb91852b66dfc451d310d0194971b03c8a68ba60a596b380cae046e3d34a75a65523f2bf6 SHA512 10a1f42df6a66f6e092d69cd0ea3d900dcef57b06391206d950a1d7f576a880829bb44d00828a030d3172184db238a22f205169c12cc32cf42c6321d61929a8c
-DIST tint2-0.14.6.tar.gz 466533 BLAKE2B c7308771e8a5a7d49410d99779ee54fd19b7d5b71d6c04eb3835100f74df5c12d692b50ce57a2a31f4956c09e404acd8cfd2bd1ef87e6fc55f21f583f5a13977 SHA512 eb1505bef932aa0cd0291dc762d3c9cbe760e3fea0684fc604aa3cae3f5ddf63e5b791db745eb29384e4732e6de09a01084f3ce2a92931b431cdf69a59b1f6da
-DIST tint2-15.3.tar.gz 500301 BLAKE2B b8b405f1c56c3de41f672dc02acef893b0650fadca9a4823c7b249661e8675e01c92c9c1588d32c2836596f34c4dbc1e5d2608cff3c75590d7eeac9e925eb874 SHA512 41ae8f8e3aac6fe55539c531889ec2883534072ad398f0693e4bfd39c80dd4c64d635a36e063f741fe89fd461f66f92adf6acdde553e0f8b169992d94dc0e344
-DIST tint2-16.1.tar.gz 534354 BLAKE2B 540287bd952ba8b54372d45055efe216dc4d9d192e33d6f83f2c734e97b9e350c7be0cb3e19d414f4e11c0bb7b505307899dea9c10ac382737a2507f7df4fdcc SHA512 c6319d5692d53e56c150906c32c794ee4237e06455efb68527b379b4ae00c48d996c63ea02ee6aefc70266335eb4cb08b4731556075c46d435b7861de6eefd3c
DIST tint2-16.2.tar.gz 537236 BLAKE2B b8ff236f4c21465603c3cdf1e3d9f62e238cfbd05fbb7976e4f90ac054566eb433d8be78ee657421b94465dceeb8461ace202090b08585693f13003d401e4faf SHA512 0e267d59aef3d812ab41c1e5904e3e96162afd8d98c76dc697fe8c2815707f34a31e392f68260311bdc66fcb4c0b1766ad549ff30d4314e6ab2e2debf069cafe
DIST tint2-16.6.1.tar.gz 546590 BLAKE2B 0e970293b09ba766d795b7bc454f06c7a9e95a7c3534144583f5739fd275d3fee2568677f24b5d9b0809ebbc466351cfa17f91dbb726f5cdae3a0bdc9b9df16f SHA512 ae3b8c7b1573f7bb993a587a125341e4018ace605b4b357a7d633beb02e7622443b92cd11b95028d4704e94211ae9f2e13e89cd3bca91474e7daba2fb9fc2b46
DIST tint2-16.6.tar.gz 546960 BLAKE2B 083e29d754c1faa9eff50dc480d18df99d64f44a2f88673f06e659d55de13c074eacf4614a57211d5b5aeec3a10f3d68471212d24a7280020b52fe91777d305d SHA512 f81770f330d3f2462292f726a6a90ac0182c518b2db7d79f098babe52863e5ceaf4293f975708f83fbc26735c79fdfefd110102ef0f4be45ae242b4f664d72b1
diff --git a/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch b/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch
deleted file mode 100644
index c6da687baca..00000000000
--- a/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 2c42a787257e0801b8454fd8960d6794831cedea Mon Sep 17 00:00:00 2001
-From: o9000 <mrovi9000@gmail.com>
-Date: Sat, 8 Oct 2016 15:02:28 +0200
-Subject: Fix compilation with ENABLE_RSVG=OFF (fixes issue #602)
-
-
-diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c
-index 0b4172f..0052e90 100644
---- a/src/launcher/launcher.c
-+++ b/src/launcher/launcher.c
-@@ -30,7 +30,6 @@
- #include <glib/gi18n.h>
- #include <glib.h>
- #include <glib/gstdio.h>
--#include <gdk-pixbuf/gdk-pixbuf.h>
- #include <sys/types.h>
-
- #include "window.h"
diff --git a/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch b/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch
deleted file mode 100644
index 21a80eb36d4..00000000000
--- a/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6306f9920f639cf092ca3f1935ac7aa202f78c86 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Fri, 13 Jan 2017 19:06:43 +0400
-Subject: [PATCH] cmake: do not hardcode icon cache update
-
----
- CMakeLists.txt | 1 -
- src/tint2conf/CMakeLists.txt | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b4a1089..ef06393 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -241,7 +241,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasin
- install( TARGETS tint2 DESTINATION bin )
- install( FILES tint2.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
- install( FILES tint2.desktop DESTINATION ${DATADIR}/applications )
--install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
- install( FILES themes/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
- install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
- install( FILES AUTHORS ChangeLog README.md doc/tint2.md doc/manual.html doc/readme.html DESTINATION ${DOCDIR} )
-diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt
-index 9595f6a..fd616fa 100644
---- a/src/tint2conf/CMakeLists.txt
-+++ b/src/tint2conf/CMakeLists.txt
-@@ -72,4 +72,3 @@ add_subdirectory(po)
- install( TARGETS tint2conf DESTINATION bin )
- install( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
- install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
--install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
---
-2.10.2
-
diff --git a/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch b/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch
deleted file mode 100644
index e9e40f305b3..00000000000
--- a/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c3a86e185d548e11bb12bc766a58fd3b617c1c46 Mon Sep 17 00:00:00 2001
-From: o9000 <mrovi9000@gmail.com>
-Date: Sun, 18 Sep 2016 12:53:59 +0200
-Subject: [PATCH] Fix include (fixes issue #596)
-
----
- src/config.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/config.c b/src/config.c
-index a831ece..13f3b7b 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -31,8 +31,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <glib/gstdio.h>
--#include <pango/pangocairo.h>
--#include <pango/pangoxft.h>
-+#include <pango/pango-font.h>
- #include <Imlib2.h>
-
- #include "config.h"
---
-libgit2 0.24.0
-
diff --git a/x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch b/x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch
deleted file mode 100644
index 6b29b49aaf7..00000000000
--- a/x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -257,7 +257,7 @@
- install( TARGETS tint2 DESTINATION bin )
- install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
- install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
--install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
-+install( FILES themes/tint2rc DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 )
- install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
- install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} )
- install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
-
diff --git a/x11-misc/tint2/tint2-0.12.12.ebuild b/x11-misc/tint2/tint2-0.12.12.ebuild
deleted file mode 100644
index 8f0b0b56d98..00000000000
--- a/x11-misc/tint2/tint2-0.12.12.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot
-
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="battery svg startup-notification tint2conf"
-
-DEPEND="
- dev-libs/glib:2
- svg? ( gnome-base/librsvg:2 )
- >=media-libs/imlib2-1.4.2[X,png]
- x11-libs/cairo[X]
- x11-libs/pango
- tint2conf? ( x11-libs/gtk+:2 )
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXinerama
- >=x11-libs/libXrandr-1.3
- x11-libs/libXrender
- startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PV}-fix-compilation-without-svg.patch"
- "${FILESDIR}/${PV}-no-hardcode-update-icon-cache.patch"
- "${FILESDIR}/${PV}-relax-pango-includes.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_BATTERY="$(usex battery)"
- -DENABLE_TINT2CONF="$(usex tint2conf)"
- -DENABLE_SN="$(usex startup-notification)"
- -DENABLE_RSVG="$(usex svg)"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/x11-misc/tint2/tint2-0.14.6-r2.ebuild b/x11-misc/tint2/tint2-0.14.6-r2.ebuild
deleted file mode 100644
index bc7cd9da3b2..00000000000
--- a/x11-misc/tint2/tint2-0.14.6-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot
-
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="battery svg startup-notification tint2conf"
-
-DEPEND="
- dev-libs/glib:2
- svg? ( gnome-base/librsvg:2 )
- >=media-libs/imlib2-1.4.2[X,png]
- x11-libs/cairo[X]
- x11-libs/pango
- tint2conf? ( x11-libs/gtk+:2 )
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXinerama
- >=x11-libs/libXrandr-1.3
- x11-libs/libXrender
- startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-# bug 629312
-PATCHES=( "${FILESDIR}/${PV}-sysconfdir-xdg2.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_BATTERY="$(usex battery)"
- -DENABLE_TINT2CONF="$(usex tint2conf)"
- -DENABLE_SN="$(usex startup-notification)"
- -DENABLE_RSVG="$(usex svg)"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/x11-misc/tint2/tint2-15.3.ebuild b/x11-misc/tint2/tint2-15.3.ebuild
deleted file mode 100644
index c34f9788549..00000000000
--- a/x11-misc/tint2/tint2-15.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot
-
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="battery svg startup-notification tint2conf"
-
-DEPEND="
- dev-libs/glib:2
- svg? ( gnome-base/librsvg:2 )
- >=media-libs/imlib2-1.4.2[X,png]
- x11-libs/cairo[X]
- x11-libs/pango
- tint2conf? ( x11-libs/gtk+:2 )
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXinerama
- >=x11-libs/libXrandr-1.3
- x11-libs/libXrender
- startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_BATTERY="$(usex battery)"
- -DENABLE_TINT2CONF="$(usex tint2conf)"
- -DENABLE_SN="$(usex startup-notification)"
- -DENABLE_RSVG="$(usex svg)"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/x11-misc/tint2/tint2-16.1.ebuild b/x11-misc/tint2/tint2-16.1.ebuild
deleted file mode 100644
index f7cbd25ca6f..00000000000
--- a/x11-misc/tint2/tint2-16.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot
-
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="battery svg startup-notification tint2conf"
-
-DEPEND="
- dev-libs/glib:2
- svg? ( gnome-base/librsvg:2 )
- >=media-libs/imlib2-1.4.2[X,png]
- x11-libs/cairo[X]
- x11-libs/pango
- tint2conf? ( x11-libs/gtk+:2 )
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXinerama
- >=x11-libs/libXrandr-1.3
- x11-libs/libXrender
- startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_BATTERY="$(usex battery)"
- -DENABLE_TINT2CONF="$(usex tint2conf)"
- -DENABLE_SN="$(usex startup-notification)"
- -DENABLE_RSVG="$(usex svg)"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/tint2/files/, x11-misc/tint2/
@ 2017-08-29 18:39 Amy Liffey
0 siblings, 0 replies; 4+ messages in thread
From: Amy Liffey @ 2017-08-29 18:39 UTC (permalink / raw
To: gentoo-commits
commit: d9d4b0be19190f0ad5c610cf07c574425bcf7ff9
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 18:34:06 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 18:37:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d4b0be
x11-misc/tint2: fix path tint2rc bug #629312
Submitted-by: Chris Mayo <aklhfex <AT> gmail.com>
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../{0.14.6-sysconfdir-xdg.patch => 0.14.6-sysconfdir-xdg2.patch} | 2 +-
x11-misc/tint2/{tint2-0.14.6-r1.ebuild => tint2-0.14.6-r2.ebuild} | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/x11-misc/tint2/files/0.14.6-sysconfdir-xdg.patch b/x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch
similarity index 86%
rename from x11-misc/tint2/files/0.14.6-sysconfdir-xdg.patch
rename to x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch
index 73da5b15a41..6b29b49aaf7 100644
--- a/x11-misc/tint2/files/0.14.6-sysconfdir-xdg.patch
+++ b/x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch
@@ -5,7 +5,7 @@
install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
-install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
-+install( FILES themes/tint2rc DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/xdg/tint2 )
++install( FILES themes/tint2rc DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 )
install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} )
install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
diff --git a/x11-misc/tint2/tint2-0.14.6-r1.ebuild b/x11-misc/tint2/tint2-0.14.6-r2.ebuild
similarity index 95%
rename from x11-misc/tint2/tint2-0.14.6-r1.ebuild
rename to x11-misc/tint2/tint2-0.14.6-r2.ebuild
index 7e9b1d53672..bc7cd9da3b2 100644
--- a/x11-misc/tint2/tint2-0.14.6-r1.ebuild
+++ b/x11-misc/tint2/tint2-0.14.6-r2.ebuild
@@ -31,7 +31,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PV}-sysconfdir-xdg.patch" )
+# bug 629312
+PATCHES=( "${FILESDIR}/${PV}-sysconfdir-xdg2.patch" )
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/tint2/files/, x11-misc/tint2/
@ 2017-08-28 16:21 Amy Liffey
0 siblings, 0 replies; 4+ messages in thread
From: Amy Liffey @ 2017-08-28 16:21 UTC (permalink / raw
To: gentoo-commits
commit: b4892d73b5d0c05d5127e90acb2d6b246b6f42e3
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 16:20:03 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 16:21:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4892d73
x11-misc/tint2: fix tint2rc for prefix bug #629134
Submitted-by: tastu teche <tastuteche <AT> yahoo.com>
Package-Manager: Portage-2.3.6, Repoman-2.3.1
x11-misc/tint2/files/0.14.6-sysconfdir-xdg.patch | 12 ++++++++++++
.../tint2/{tint2-0.14.6.ebuild => tint2-0.14.6-r1.ebuild} | 2 ++
2 files changed, 14 insertions(+)
diff --git a/x11-misc/tint2/files/0.14.6-sysconfdir-xdg.patch b/x11-misc/tint2/files/0.14.6-sysconfdir-xdg.patch
new file mode 100644
index 00000000000..73da5b15a41
--- /dev/null
+++ b/x11-misc/tint2/files/0.14.6-sysconfdir-xdg.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -257,7 +257,7 @@
+ install( TARGETS tint2 DESTINATION bin )
+ install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
+-install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
++install( FILES themes/tint2rc DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} )
+ install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
+
diff --git a/x11-misc/tint2/tint2-0.14.6.ebuild b/x11-misc/tint2/tint2-0.14.6-r1.ebuild
similarity index 95%
rename from x11-misc/tint2/tint2-0.14.6.ebuild
rename to x11-misc/tint2/tint2-0.14.6-r1.ebuild
index c34f9788549..7e9b1d53672 100644
--- a/x11-misc/tint2/tint2-0.14.6.ebuild
+++ b/x11-misc/tint2/tint2-0.14.6-r1.ebuild
@@ -31,6 +31,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PV}-sysconfdir-xdg.patch" )
+
src_configure() {
local mycmakeargs=(
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/tint2/files/, x11-misc/tint2/
@ 2017-01-14 12:40 Amy Liffey
0 siblings, 0 replies; 4+ messages in thread
From: Amy Liffey @ 2017-01-14 12:40 UTC (permalink / raw
To: gentoo-commits
commit: fb1fb1e3ddd1e9b9c0710e596c30d4f2359f2427
Author: Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Fri Jan 13 19:13:15 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 12:39:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb1fb1e3
x11-misc/tint2: version bump, EAPI 6 bump
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=590798
Closes:#3451
x11-misc/tint2/Manifest | 1 +
.../0.12.12-fix-compilation-without-svg.patch | 18 ++++++
.../0.12.12-no-hardcode-update-icon-cache.patch | 34 +++++++++++
.../tint2/files/0.12.12-relax-pango-includes.patch | 26 +++++++++
x11-misc/tint2/tint2-0.12.12.ebuild | 66 ++++++++++++++++++++++
5 files changed, 145 insertions(+)
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index d69f155..9eaf5c4 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1,2 +1,3 @@
DIST tint2-0.11.tar.bz2 91716 SHA256 fe106e6a6057d2631abddde9f82d3fd4fb1985c4fb93f10d3886417a9e22471d SHA512 db88c17780d24b82badbedbce4518d736dfcb2a730ff500bcb36f2b32f65271c2424f0c2a34981f9d3af033b84252db0c8217e2dd7ca57f9a0eadbc98796115c WHIRLPOOL 4c497995bc5713199a8e624ebfa463edbd610b6d948f1cbfce11ec78e4cd2cd6fad51bd58937b0fce343bb86a29a35bc40eec2bafb687c6ee89355bceb5486ec
+DIST tint2-0.12.12.tar.gz 469724 SHA256 e4c6ffb67eb1242f19d94037b072602bc751ac71ca61352dea3465168e643450 SHA512 10a1f42df6a66f6e092d69cd0ea3d900dcef57b06391206d950a1d7f576a880829bb44d00828a030d3172184db238a22f205169c12cc32cf42c6321d61929a8c WHIRLPOOL 197b92a93eb0368708824159bde41bd81143d0423a1f9ab83b2af4a11b3e3055a40481b9746f095e10cca84f7d772237a92d06bf267761021be308c0b3b5d553
DIST tint2-0.12.3.tar.gz 251977 SHA256 655cde38f4d358d69f3628f722c7da7768e193769ac876cc24b59f328bcd3d6c SHA512 8022895617905446bc01e548ece9df63d32ae1ef3bafc2de2c79fb2c0e91ab78d036e8c9165ea4d4224dd70edb510266bbea47baf382abbf27a275b60b7d1465 WHIRLPOOL 057ba74074d5e013d9c882a6cbef1bd75f80b1eba857bda933c5936511b1d2b9a519c770b1a2f31360774232e03962ca47dea73ad5f4ef21bcd6530d2c123662
diff --git a/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch b/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch
new file mode 100644
index 00000000..c6da687
--- /dev/null
+++ b/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch
@@ -0,0 +1,18 @@
+From 2c42a787257e0801b8454fd8960d6794831cedea Mon Sep 17 00:00:00 2001
+From: o9000 <mrovi9000@gmail.com>
+Date: Sat, 8 Oct 2016 15:02:28 +0200
+Subject: Fix compilation with ENABLE_RSVG=OFF (fixes issue #602)
+
+
+diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c
+index 0b4172f..0052e90 100644
+--- a/src/launcher/launcher.c
++++ b/src/launcher/launcher.c
+@@ -30,7 +30,6 @@
+ #include <glib/gi18n.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
+-#include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <sys/types.h>
+
+ #include "window.h"
diff --git a/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch b/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch
new file mode 100644
index 00000000..21a80eb
--- /dev/null
+++ b/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch
@@ -0,0 +1,34 @@
+From 6306f9920f639cf092ca3f1935ac7aa202f78c86 Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Fri, 13 Jan 2017 19:06:43 +0400
+Subject: [PATCH] cmake: do not hardcode icon cache update
+
+---
+ CMakeLists.txt | 1 -
+ src/tint2conf/CMakeLists.txt | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b4a1089..ef06393 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -241,7 +241,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasin
+ install( TARGETS tint2 DESTINATION bin )
+ install( FILES tint2.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2.desktop DESTINATION ${DATADIR}/applications )
+-install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
+ install( FILES themes/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README.md doc/tint2.md doc/manual.html doc/readme.html DESTINATION ${DOCDIR} )
+diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt
+index 9595f6a..fd616fa 100644
+--- a/src/tint2conf/CMakeLists.txt
++++ b/src/tint2conf/CMakeLists.txt
+@@ -72,4 +72,3 @@ add_subdirectory(po)
+ install( TARGETS tint2conf DESTINATION bin )
+ install( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
+-install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
+--
+2.10.2
+
diff --git a/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch b/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch
new file mode 100644
index 00000000..e9e40f3
--- /dev/null
+++ b/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch
@@ -0,0 +1,26 @@
+From c3a86e185d548e11bb12bc766a58fd3b617c1c46 Mon Sep 17 00:00:00 2001
+From: o9000 <mrovi9000@gmail.com>
+Date: Sun, 18 Sep 2016 12:53:59 +0200
+Subject: [PATCH] Fix include (fixes issue #596)
+
+---
+ src/config.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/config.c b/src/config.c
+index a831ece..13f3b7b 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -31,8 +31,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <glib/gstdio.h>
+-#include <pango/pangocairo.h>
+-#include <pango/pangoxft.h>
++#include <pango/pango-font.h>
+ #include <Imlib2.h>
+
+ #include "config.h"
+--
+libgit2 0.24.0
+
diff --git a/x11-misc/tint2/tint2-0.12.12.ebuild b/x11-misc/tint2/tint2-0.12.12.ebuild
new file mode 100644
index 00000000..785c1a2
--- /dev/null
+++ b/x11-misc/tint2/tint2-0.12.12.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils vcs-snapshot
+
+DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
+HOMEPAGE="https://gitlab.com/o9000/tint2"
+SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="battery svg startup-notification tint2conf"
+
+DEPEND="
+ dev-libs/glib:2
+ svg? ( gnome-base/librsvg:2 )
+ >=media-libs/imlib2-1.4.2[X,png]
+ x11-libs/cairo[X]
+ x11-libs/pango
+ tint2conf? ( x11-libs/gtk+:2 )
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ >=x11-libs/libXrandr-1.3
+ x11-libs/libXrender
+ startup-notification? ( x11-libs/startup-notification )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PV}-fix-compilation-without-svg.patch"
+ "${FILESDIR}/${PV}-no-hardcode-update-icon-cache.patch"
+ "${FILESDIR}/${PV}-relax-pango-includes.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_BATTERY="$(usex battery)"
+ -DENABLE_TINT2CONF="$(usex tint2conf)"
+ -DENABLE_SN="$(usex startup-notification)"
+ -DENABLE_RSVG="$(usex svg)"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-25 21:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-25 21:21 [gentoo-commits] repo/gentoo:master commit in: x11-misc/tint2/files/, x11-misc/tint2/ Amy Liffey
-- strict thread matches above, loose matches on Subject: below --
2017-08-29 18:39 Amy Liffey
2017-08-28 16:21 Amy Liffey
2017-01-14 12:40 Amy Liffey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox