* [gentoo-commits] repo/gentoo:master commit in: x11-misc/tint2/, x11-misc/tint2/files/
@ 2015-12-27 20:00 Amy Winston
0 siblings, 0 replies; 2+ messages in thread
From: Amy Winston @ 2015-12-27 20:00 UTC (permalink / raw
To: gentoo-commits
commit: ca2302350f8bbe7675f907ace7b7ec398f1435d2
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 19:58:19 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 19:58:19 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca230235
x11-misc/tint2: version bump 0.12.3 bug #565876.Thanks Anthony Parsons.
Package-Manager: portage-2.2.24
x11-misc/tint2/Manifest | 1 +
.../0.12.3-no-hardcode-update-icon-cache.patch | 21 +++++++
x11-misc/tint2/tint2-0.12.3.ebuild | 67 ++++++++++++++++++++++
3 files changed, 89 insertions(+)
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index d76be05..d69f155 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1 +1,2 @@
DIST tint2-0.11.tar.bz2 91716 SHA256 fe106e6a6057d2631abddde9f82d3fd4fb1985c4fb93f10d3886417a9e22471d SHA512 db88c17780d24b82badbedbce4518d736dfcb2a730ff500bcb36f2b32f65271c2424f0c2a34981f9d3af033b84252db0c8217e2dd7ca57f9a0eadbc98796115c WHIRLPOOL 4c497995bc5713199a8e624ebfa463edbd610b6d948f1cbfce11ec78e4cd2cd6fad51bd58937b0fce343bb86a29a35bc40eec2bafb687c6ee89355bceb5486ec
+DIST tint2-0.12.3.tar.gz 251977 SHA256 655cde38f4d358d69f3628f722c7da7768e193769ac876cc24b59f328bcd3d6c SHA512 8022895617905446bc01e548ece9df63d32ae1ef3bafc2de2c79fb2c0e91ab78d036e8c9165ea4d4224dd70edb510266bbea47baf382abbf27a275b60b7d1465 WHIRLPOOL 057ba74074d5e013d9c882a6cbef1bd75f80b1eba857bda933c5936511b1d2b9a519c770b1a2f31360774232e03962ca47dea73ad5f4ef21bcd6530d2c123662
diff --git a/x11-misc/tint2/files/0.12.3-no-hardcode-update-icon-cache.patch b/x11-misc/tint2/files/0.12.3-no-hardcode-update-icon-cache.patch
new file mode 100644
index 0000000..f923e06
--- /dev/null
+++ b/x11-misc/tint2/files/0.12.3-no-hardcode-update-icon-cache.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 155672e2245a..a4b6dc0c7eda 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -176,7 +176,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 sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} )
+diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt
+index e8c6db38fe20..f844c24371e7 100644
+--- a/src/tint2conf/CMakeLists.txt
++++ b/src/tint2conf/CMakeLists.txt
+@@ -71,4 +71,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})" )
diff --git a/x11-misc/tint2/tint2-0.12.3.ebuild b/x11-misc/tint2/tint2-0.12.3.ebuild
new file mode 100644
index 0000000..c2415d3
--- /dev/null
+++ b/x11-misc/tint2/tint2-0.12.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils gnome2-utils
+
+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 examples svg startup-notification tint2conf"
+
+DEPEND="
+ dev-libs/glib:2
+ svg? ( gnome-base/librsvg:2 )
+ >=media-libs/imlib2-1.4.2[X]
+ x11-libs/cairo
+ x11-libs/pango[X]
+ 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}"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+PATCHES=( "${FILESDIR}/${PV}-no-hardcode-update-icon-cache.patch" )
+
+src_unpack() {
+ default
+ # Chop off the SHA1 gitlab's automated tarballs inject
+ mv "${PN}-v${PV}-"* "${PN}-v${PV}"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable battery BATTERY)
+ $(cmake-utils_use_enable examples EXAMPLES)
+ $(cmake-utils_use_enable tint2conf TINT2CONF)
+ $(cmake-utils_use_enable startup-notification SN)
+ $(cmake-utils_use_enable svg RSVG)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/tint2/, x11-misc/tint2/files/
@ 2017-03-07 9:14 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-03-07 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 6867019eb0bc888f1e383f0cbe5e37a06421df7c
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Mon Mar 6 15:08:00 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 09:12:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6867019e
x11-misc/tint2: Remove old
Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4142
x11-misc/tint2/Manifest | 1 -
x11-misc/tint2/files/battery_segfault.patch | 20 -----------
x11-misc/tint2/tint2-0.11-r2.ebuild | 55 -----------------------------
3 files changed, 76 deletions(-)
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 9eaf5c4684e..7a6660f32aa 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1,3 +1,2 @@
-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/battery_segfault.patch b/x11-misc/tint2/files/battery_segfault.patch
deleted file mode 100644
index 3f933e2f522..00000000000
--- a/x11-misc/tint2/files/battery_segfault.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: battery.c
-===================================================================
---- src/battery/battery.c (revision 575)
-+++ src/battery/battery.c (revision 576)
-@@ -194,8 +194,14 @@
- }
- g_free(path2);
- }
-+
-+ path_current_now = g_build_filename(battery_dir, "power_now", NULL);
-+ if (!g_file_test (path_current_now, G_FILE_TEST_EXISTS)) {
-+ g_free(path_current_now);
-+ path_current_now = g_build_filename(battery_dir, "current_now", NULL);
-+ }
-+
- if (path_energy_now && path_energy_full) {
-- path_current_now = g_build_filename(battery_dir, "current_now", NULL);
- path_status = g_build_filename(battery_dir, "status", NULL);
-
- // check file
diff --git a/x11-misc/tint2/tint2-0.11-r2.ebuild b/x11-misc/tint2/tint2-0.11-r2.ebuild
deleted file mode 100644
index b4ac0ede3cc..00000000000
--- a/x11-misc/tint2/tint2-0.11-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A lightweight panel/taskbar"
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://tint2.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="battery examples tint2conf"
-
-COMMON_DEPEND="dev-libs/glib:2
- x11-libs/cairo
- x11-libs/pango[X]
- x11-libs/libX11
- x11-libs/libXinerama
- x11-libs/libXdamage
- x11-libs/libXcomposite
- x11-libs/libXrender
- x11-libs/libXrandr
- media-libs/imlib2[X]"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- x11-proto/xineramaproto"
-RDEPEND="${COMMON_DEPEND}
- tint2conf? ( x11-misc/tintwizard )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/battery_segfault.patch" ) # bug 343963
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_enable battery BATTERY)
- $(cmake-utils_use_enable examples EXAMPLES)
- $(cmake-utils_use_enable tint2conf TINT2CONF)
-
- # bug 296890
- "-DDOCDIR=/usr/share/doc/${PF}"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- rm -f "${D}/usr/bin/tintwizard.py"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-07 9:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-07 9:14 [gentoo-commits] repo/gentoo:master commit in: x11-misc/tint2/, x11-misc/tint2/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2015-12-27 20:00 Amy Winston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox