[#155] Set LOCALE_DIR path to look for translations into /usr/share/l…

…ocale. Add gettext key into .desktop file. Remove some leftovers related to Precise.
shiznix · Sep 17, 2016 · ccab0fb · ccab0fb
1 parent bd8f0a1
commit ccab0fb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/gnome-extra/activity-log-manager/Manifest b/gnome-extra/activity-log-manager/Manifest
@@ -2,5 +2,5 @@ AUX config.vapi 491 SHA256 a90902537bec20aa45dbe9fa1926cec355c3b97464bb9da6f2486
 AUX gtkapplication-fix.patch 1104 SHA256 f97f51fb635efface96490d4db478bb373d8cc5300fe68e3c575fdd56cb7440b SHA512 9d8c0ca5a57d1b76fac2cb2b8b2c216bc5523d13985bb3e58fef4f69f5ea4748e6550ed2953abd38d9865edaf27c2f810ad52987b31f69e4c2d8b3189aae02d9 WHIRLPOOL bafa25a04dbb728ef814dea130346be3b1343058ac90ed0b6b401714f9720a102ca850f5f3d6885ecaf11e70e5ac81448895f33a1938100c43df65712e5cab2e
 DIST activity-log-manager_0.9.7-0ubuntu23.debian.tar.xz 36296 SHA256 6322651133af0047307a390d8a1848c3fa2094016223efa790f060d353e668e6 SHA512 64a7158f1c188aab1312f42eaf51217a80ece1895d18d7f59d2397b6e926776025a746e765faa0bb3adda95d557a71f470b3d5dcc94a0c1ff46589c8d00c8ac1 WHIRLPOOL f4870a44df40a07f6072232c43c4a09d9067dcbf085f55859f86689477f1921e579c79283ec1aee8e1ed18cde7dfebfcd5e66a4fcf80f4ca0c9c6c2bef62c1fe
 DIST activity-log-manager_0.9.7.orig.tar.xz 332004 SHA256 53014a08056168171579c210a8e5cfd949a0efe3bd23f6d38cd0ce0b0168841f SHA512 e0a43cae08e7f86b35ab8a4b0c70a4eb4a2ae821d3ab907a5c4135640e67c572ec2e735a3350099e3febe177d67db83af526c62b7b595894c0df08d84c3bb6ce WHIRLPOOL 7d92d5cb0fbc1b3353dab4164115e9e93efb4859a055ce9b9fffe3a580c49534e0b6e61c321ea7f896b7f166551c57bd3fd06a2692694a1c36e7554b0a014352
-EBUILD activity-log-manager-0.9.7_p0_p23.ebuild 1891 SHA256 658940437da42f976546acc9c4b79b1583446edf0702922c577a8e4d5e2a038f SHA512 40268b790fd54d9359f2a7f411bb96b88b7545497bda08ff8ea3eb4c7d897361b0b2decd4dc37c1cb3003ea36ef8d22435d067ceb15e8f84ca8e73087a017072 WHIRLPOOL 70aa2642d2a67254241758e6d9a89d650cbf9c0b77dcda3da2eec140469c505855ce9a670e928f0f7c919f16715e2725cc0108a4bae7b21b2288c15c4664b15d
+EBUILD activity-log-manager-0.9.7_p0_p23-r1.ebuild 1480 SHA256 b282e5d8de0b7db433fa3aad6034d6e6c505aa7a091486674bd7428d2e71f782 SHA512 b589496f87d4b0399597786b58914ad8acd683cb73d7bfeae1c4c8bce945f6bf5353ca8dc6f67ae7b7c37f5705f1df819ebdea145dde7e5a7fd0b302e4d70e79 WHIRLPOOL dbc94f89905a6fa9ec6a139848074ad50b5a0838d5225e00d12350eae28bdd1954c869b8af6a80301ed484e382f793f237c40a3af1b6ad4bbe84c3c0ee8088e4
 MISC metadata.xml 362 SHA256 81909e6f96cd35fc7a97a5c9f1669292ff98d12690a7274920e7b8ed31ed02b7 SHA512 74e11b5a19cfe8aa9ed40021a7661aee3abec911b321ea75630d2e6799a4420e4251faef690d3296f689b17a03dc9aad89df56cfd064d84e824d712d3232efe8 WHIRLPOOL 0e8df343ad1219a4269fe1ba0cba1edf07c331e7e83800236294f4d1e7c9d88dfc0073674068f591d80e464389caa50099260f132b52f2b4d4168aa8fbeb4215
diff --git a/.../activity-log-manager-0.9.7_p0_p23.ebuild → ...tivity-log-manager-0.9.7_p0_p23-r1.ebuild b/.../activity-log-manager-0.9.7_p0_p23.ebuild → ...tivity-log-manager-0.9.7_p0_p23-r1.ebuild
@@ -35,38 +35,27 @@ DEPEND="dev-libs/glib:2
 src_prepare() {
 	ubuntu-versionator_src_prepare
 
-	# Install docs in /usr/share/doc #
-	sed -e "s:\${prefix}/doc/alm:/usr/share/doc/${P}:g" \
-		-i Makefile{.am,.in} || die
+	# Add X-GNOME-Gettext-Domain to .desktop launcher to use translation support #
+	find ${S}/data -type f -name "*.desktop.in" -exec sh -c 'echo X-GNOME-Gettext-Domain=activity-log-manager >> "$1"' -- {} \;
 
-	cp "${FILESDIR}"/config.vapi src/ || die
 	vala_src_prepare
 	export VALA_API_GEN="$VAPIGEN"
 
-	# Fix broken libgnome-control-center check #
-	sed -e 's:test "x$with_ccpanel" != xcheck:test "x$with_ccpanel" != xcheck \&\& test "x$with_ccpanel" != xno:g' \
-		-i configure.ac
 	eautoreconf
 }
 
 src_configure() {
 	econf --with-ccpanel=no
+
+	# Fix LOCALE_DIR prefix #
+	sed -e "s:\"//:\"/usr/share/:g" \
+		-i config.h
 }
 
 src_install() {
 	emake DESTDIR="${ED}" install
 	dodoc README NEWS INSTALL ChangeLog AUTHORS
 
-	# Remove whoopsie crash database error tracking submission daemon #
-	rm -rf "${ED}etc" \
-		"${ED}usr/share/dbus-1" \
-		"${ED}usr/share/polkit-1" \
-		"${ED}usr/share/gnome-control-center"
-
-	# Remove all installed language files as they can be incomplete #
-	#  due to being provided by Ubuntu's language-pack packages #
-	rm -rf "${ED}usr/share/locale"
-
 	prune_libtool_files --modules
 }