diff options
Diffstat (limited to 'app-misc')
37 files changed, 1215 insertions, 333 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz Binary files differindex 17177d6b6ff5..e28ccc4fdd5e 100644 --- a/app-misc/Manifest.gz +++ b/app-misc/Manifest.gz diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest index 2b2f8aa97a1a..2ff09f844285 100644 --- a/app-misc/bijiben/Manifest +++ b/app-misc/bijiben/Manifest @@ -1,3 +1,5 @@ DIST bijiben-3.26.1.tar.xz 864676 BLAKE2B 8c15939d356af70ed30c8bf7dcb9cb8d81ac6f1ad5969b0b6e9fefd08efd267c65454f582e368d5183425d3cfba9fe6d2d227d1825f1c7be52fbdc5ff53ef0ff SHA512 a057fcd0400eecff90bd8feb67c775ca036d0f40e92b44cc1f35fe418288ad9aec5cfb080c8c47ba862bfbecfd94ec69a0bbd811e0364d2e273901b7d4a8b2f9 +DIST bijiben-3.26.2.tar.xz 865148 BLAKE2B 77bb78745295d414153e18491fd16faad29defabaff4ad979db7cc6e6fe075e042dd8b04d321282fbfbf163541818019bc2cbda0f8562010dfc32f275f3f54e8 SHA512 1db8c5e605b5c6a0fcd8743365a53b6ab2d986a18d501a3f02e892bcfc8ba91e9ca933b6f2a4318f71724b40f190d0ebc18eabfe1332de6765b9bca09d36718e EBUILD bijiben-3.26.1.ebuild 687 BLAKE2B fcf3074dbbd8d75d92d6c58ffdf3aaab8607a4d6b97ebff1b66aa64070c6e25dcc143848714003dc38af6ec8a96e3b0de451e0d7cc6eaeb2fe544c495d5b06ff SHA512 1d3e258e55e47849833a356992e9923c700c8e71c6ba6dbb14b74067003b093409c038e508294846b33e7cf33f3349c2a15d1bf85f33052c3ddcee77f8ccdbd8 +EBUILD bijiben-3.26.2.ebuild 685 BLAKE2B d60c0e8d62182ab54dc21b315f115a8cb13e3bec563d1fc2e74db947e3aeff22997614c416a750188e7c6a854b9886d1ff21a77334d5f5664306dbde1f95ffa1 SHA512 7e3bf009eee9d82add56455cad1c6bf2ad430af49ccc86578206446859b9385c9d9cbf2a0c9c3ba07430f740f2ec21a46791741df6eccfe1704ae15ebbae7450 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/app-misc/bijiben/bijiben-3.26.2.ebuild b/app-misc/bijiben/bijiben-3.26.2.ebuild new file mode 100644 index 000000000000..f6d4902983e9 --- /dev/null +++ b/app-misc/bijiben/bijiben-3.26.2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="Note editor designed to remain simple to use" +HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-libs/glib-2.53.4:2 + >=x11-libs/gtk+-3.11.4:3 + >=gnome-extra/evolution-data-server-3.13.90:= + >=net-libs/webkit-gtk-2.10.0:4 + net-libs/gnome-online-accounts:= + dev-libs/libxml2:2 + app-misc/tracker:= + sys-apps/util-linux +" +DEPEND="${RDEPEND} + dev-libs/appstream-glib + dev-util/gdbus-codegen + >=dev-util/intltool-0.50.1 + dev-util/itstool + sys-devel/gettext + virtual/pkgconfig +" diff --git a/app-misc/digitemp/Manifest b/app-misc/digitemp/Manifest index 859be87da990..d05391131148 100644 --- a/app-misc/digitemp/Manifest +++ b/app-misc/digitemp/Manifest @@ -1,5 +1,5 @@ DIST digitemp-3.5.0.tar.gz 267947 BLAKE2B bdd5cd84160d4826205ac74676897b9caa296c203fcde738c99f89baaeb7637f3995afeb7741e1d1d3e6cb64776de2479fe7d54d1b499a400cbf7b59f8d46349 SHA512 59055a97ae35cdc86bb893a755975b688d3be9185e717f5da0024d664e6c93dd5a7f10f1230772c3bc1bc76a088392da083ba63d28e054727b9f68ce31de64d3 DIST digitemp-3.7.1.tar.gz 144870 BLAKE2B 5d00197ba0122772d96c3185f430119961d214f50dc07dcd5881e1aa1135283680ff38b4d92736827f5c7644b11930b9418b8467f276e832e40f4228d08d1774 SHA512 e5eaf576b544c61049a358dece7dc96d9793b751ef08645060f3b2c1a2006e2906c3aa3f97de3dab46818290d664d2e784a948b2495b538a200b6d71b03173d2 EBUILD digitemp-3.5.0-r2.ebuild 1826 BLAKE2B a9cfe9ca027e64237c2e46a8e1f216e0824eccec720c84e9e17fcae440c058ef4cc49e366259e075de879c0fe9014dbffc1a088b1a91a2674efe84872e06a5ee SHA512 2dc36c29e0c64c9f87372493d0aefb26105af1cee219c51ed6c4d224a378cec9a793fdcbfccbfa3bc1f94733ce286f8562fede0bfa1626faee3995aefa0f63f6 -EBUILD digitemp-3.7.1.ebuild 1845 BLAKE2B 8a2fd58c5505e05edf1982b14dc89e589e498b948d15647ab9ff8061ae25b088715a2b701878e938cbf8e483222283d810dd546aecb4464d95ad239678587f4b SHA512 7d6d89ef1d5f3d8bd154073f8dcf05d40847ec9d202b3c03b3ca42d22fdcb78560f11c090a26bdae07cc5ee9def88c3de98fe8e05f12427ea4ec2ef90605acca +EBUILD digitemp-3.7.1.ebuild 1841 BLAKE2B 4cbd7434d157518b81ff9f62a371fd668b2f34fa03f31a664470ce914e4a74c8d1256731cee78ef6966ca03f51f025690db0d64aeca16d5a2fc1700c613060b0 SHA512 42bc14254551919ba4bb9a1ed2abe644e0960736d4afa652bea3af0ebf0cc195ba007802ceac71e5b6a86c1345bb2832387cf7f2af1e01812c129e6498e44fc2 MISC metadata.xml 982 BLAKE2B 9a74eb54a17f249dd527e5aa4b292dadce934da1d1303ba6ca3bb5503c5e235836261495af1eb3c04e0322725c46838b1c902e8f5862856edb3696a147a74184 SHA512 8dda9bc7dff244e54e4951d553f2255bd1da1279221374fc514b5483e36ae129fc9e154c8bf07bf66b3ddc9b2bdac172184b3d9b89c06852f0f9f2237de627a2 diff --git a/app-misc/digitemp/digitemp-3.7.1.ebuild b/app-misc/digitemp/digitemp-3.7.1.ebuild index 718f8d20bbf8..7ab742c6848d 100644 --- a/app-misc/digitemp/digitemp-3.7.1.ebuild +++ b/app-misc/digitemp/digitemp-3.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/bcl/digitemp/archive/v${PV}.tar.gz -> ${P}.tar.gz" IUSE="ds9097 ds9097u ds2490" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" DEPEND="ds2490? ( virtual/libusb:0 )" diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest index 0ecacf4d0268..2687390358d0 100644 --- a/app-misc/geoclue/Manifest +++ b/app-misc/geoclue/Manifest @@ -1,11 +1,6 @@ -AUX geoclue-0.12.0_p20110307-use-fallback-mac.patch 511 BLAKE2B eae5d5fce3b87d6d34141f0438676d862816443d0d808fe1a1e28cbc7535c59fcc54f414890107fcb5896e1e566e746dd0f03a6f478502862d45abd2aed6c2c1 SHA512 e2845272cca268c4658c3e836efd7b49bc53e7690125bc48a7d1d9d0b82b46ea88fff427ee73fa2045c74c2dfe21d45497341032363713a6401a735110bcd1e0 -AUX geoclue-0.12.0_p20110307-use-flag.patch 2571 BLAKE2B 17c6d6009bc8bc089c2fa882f5e270186f32990cc804d7172f719ec50fad97331d72d88f93c6b829b54bf106fa0ff58fb008c6ad7c2ee7f6d1433488c4cf7c47 SHA512 9558635f1c520f26c30edcd2512934a6f3238c0fabf88e2e5b345aa8521575faad2e734d84e99071b827cc81724fab27299f2b838a48993e3110d2fa6ba82eef -AUX geoclue-0.12.99-gpsd.patch 2073 BLAKE2B 499774d91864ada9ef29a2154e17bed7e143f0e13fb30a6e9d8231f6f6e7fac9b35f99b042aa05aade1ad139dd9d393951b16dee10c3bb104aa325fa418cf24c SHA512 9a5280af319cea99567fbbaf8174f11de71f9dbbeb146c4ad42a19df1d84f7573c9cd72560b7185065e5b8507770f77fa3cc06b3e45e0a56fdf3d3e5b717f0bc AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18aefce2f72144cdb779ae11bdfe7370fcb9b14a9e53e9314d69c7e35e8eb541c5db3b61ae7a94fc99bf1c2aa2a0beeff1584928f05 SHA512 27d2d750d2cc52714276d5b4431444c31e0ff59fc1fabf659efe77d427dad67de376e6bf4aa55882ced21c56ef1d4dff05aeac62372a5174acf7e5f40d5f061b -DIST geoclue-0.12.99.tar.gz 608074 BLAKE2B af0c8141ade57791159f87ee7725134f18ba07cfdf9207c26c1ce77fd46a41aabfec4ba37882816bd70341964db2a89c2bc327292c097ea2e413dcb4bd7385c8 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2 DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78 DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d -EBUILD geoclue-0.12.99.ebuild 1976 BLAKE2B ed7a3e5561e9437c99fdd802496f8a88e9346bbe4c37cd5c58bb59ccbd9424483bb6faa24ccb15bbd66c7512fd2fe7bc7c9f761f3e7bcbaf674825953a9fefbf SHA512 ded60d1f1045cf6d05963fcb49eba167445526833651c095874c01b5dba837075b0ae4a0e4586f31a3dcaf56dcd4b2ee6019e926608f4e5218d0bea7db9eddc8 EBUILD geoclue-2.4.13.ebuild 1682 BLAKE2B 96815c2ca11afecb006e9fc617828b9182943fd6521934a6c47031402653996a9257366828503247838a569aa6d11e7faff3df756820863f6ff41d54bfbd5dbc SHA512 f2be75fae7d6400c7973cded35c6c61e4d6e3958d44e1bcb374ca7ea3e9394315c40319d50f5999713affb52a36a5f99b9a90e57bb07e4a36a2ad4706914e668 -EBUILD geoclue-2.4.8.ebuild 1594 BLAKE2B 0c55271ca750c2b6cd3d8471c7e8b9ac053781bf0f467903e67472e77476f7205af16dc93f2d878995dc3265f2f052707b0bbcf2478daa1ef8ac9f672766adaf SHA512 397335446dba393fa5b737cc274fb72eadff774c8a95635a0dca7916130091b94f24f02e304f2420b727223bc39c1ed7dda0be4f31657485734650d0ab02bf98 -MISC metadata.xml 1062 BLAKE2B 11f3d019f7c014387f5b3faece7dd7f165e106dd27132cf56bf59b35be2fe2ac0dd02751eb87e4e8bfa77fdecf076217eb76e6e5b37acb33c26d2f26cf1ca942 SHA512 3747063a944f72bed17f4948a0c8041746cf61fe85f2b4886cf6b8f88c01dd4cbab37a94447c3a900416bf1a374d88deb812f89789e74f4465654b26fe18899d +EBUILD geoclue-2.4.8.ebuild 1593 BLAKE2B 777a65cc6b1249f4f2d80784d6d367b1f23ec70d2840f1ac165a019f4710993c49ba894a91786fd8b1627b2c44f99df5ab2d1e12ab7bcb58407dcaa852450a0c SHA512 c1e4e05051dbc1a18e72cfba1c60adeff595b72600a1fdf3c923367ba86e6e4fec5d38b45171ce7eee7c11b0d9209e9291a62212107056423e384d91a2cf26f4 +MISC metadata.xml 522 BLAKE2B 8a0c7c99c984e6aa1a2360deffb947c126e52681dd207afc5b75eae4731492f28199a74cc4febec4265e4497320b9213521a528c5ec8339efa2c0490c8769e27 SHA512 719b3b64c6bce05a9b02818748a96081ab73c4124296266c545306014862f38124d9f20578938af4b99eb416c053070fa5c801d7823a87fe845f6d1ca99536ec diff --git a/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch b/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch deleted file mode 100644 index 9c9115a284ef..000000000000 --- a/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch +++ /dev/null @@ -1,16 +0,0 @@ -Force geoclue to use the "fallback" mac address fetching code. -The NM-based code does not seem to work. - -Patch by Kevin McCarthy <signals@gentoo.org> - ---- src/connectivity.c -+++ src/connectivity.c -@@ -218,7 +218,7 @@ - geoclue_connectivity_get_router_mac (GeoclueConnectivity *self) - { - if (self == NULL || -- GEOCLUE_CONNECTIVITY_GET_INTERFACE (self)->get_router_mac == NULL) { -+ GEOCLUE_CONNECTIVITY_GET_INTERFACE (self)->get_router_mac == NULL || 1) { - char *mac = NULL; - guint i; - int ret_val; diff --git a/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch b/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch deleted file mode 100644 index 236c98928ba7..000000000000 --- a/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch +++ /dev/null @@ -1,79 +0,0 @@ -Add configure options for all providers except localnet. - -Patch by Kevin McCarthy <signals@gentoo.org> - ---- configure.ac -+++ configure.ac -@@ -158,7 +158,71 @@ - AC_SUBST(CONNECTIVITY_LIBS) - AC_SUBST(CONNECTIVITY_CFLAGS) - --PROVIDER_SUBDIRS="example hostip geonames nominatim manual plazes localnet yahoo gsmloc" -+PROVIDER_SUBDIRS="localnet" -+ -+AC_ARG_ENABLE(hostip, -+ AS_HELP_STRING([--enable-hostip=@<:@no/yes/auto@:>@], -+ [build with hostip support]), , -+ enable_hostip=auto) -+ -+if test "x$enable_hostip" != "xno"; then -+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS hostip" -+fi -+ -+AC_ARG_ENABLE(geonames, -+ AS_HELP_STRING([--enable-geonames=@<:@no/yes/auto@:>@], -+ [build with geonames support]), , -+ enable_geonames=auto) -+ -+if test "x$enable_geonames" != "xno"; then -+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS geonames" -+fi -+ -+AC_ARG_ENABLE(nominatim, -+ AS_HELP_STRING([--enable-nominatim=@<:@no/yes/auto@:>@], -+ [build with nominatim support]), , -+ enable_nominatim=auto) -+ -+if test "x$enable_nominatim" != "xno"; then -+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS nominatim" -+fi -+ -+AC_ARG_ENABLE(manual, -+ AS_HELP_STRING([--enable-manual=@<:@no/yes/auto@:>@], -+ [build with manual support]), , -+ enable_manual=auto) -+ -+if test "x$enable_manual" != "xno"; then -+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS manual" -+fi -+ -+AC_ARG_ENABLE(plazes, -+ AS_HELP_STRING([--enable-plazes=@<:@no/yes/auto@:>@], -+ [build with plazes support]), , -+ enable_plazes=auto) -+ -+if test "x$enable_plazes" != "xno"; then -+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS plazes" -+fi -+ -+AC_ARG_ENABLE(yahoo, -+ AS_HELP_STRING([--enable-yahoo=@<:@no/yes/auto@:>@], -+ [build with yahoo support]), , -+ enable_yahoo=auto) -+ -+if test "x$enable_yahoo" != "xno"; then -+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS yahoo" -+fi -+ -+AC_ARG_ENABLE(gsmloc, -+ AS_HELP_STRING([--enable-gsmloc=@<:@no/yes/auto@:>@], -+ [build with gsmloc support]), , -+ enable_gsmloc=auto) -+ -+if test "x$enable_gsmloc" != "xno"; then -+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gsmloc" -+fi -+ - - # ----------------------------------------------------------- - # gypsy / gpsd / skyhook diff --git a/app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch b/app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch deleted file mode 100644 index 51160d6296e0..000000000000 --- a/app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch +++ /dev/null @@ -1,73 +0,0 @@ -Description: Refactoring to support new libgps API -Author: James Page <james.page@ubuntu.com> -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40996 -Forwarded: no - ---- providers/gpsd/geoclue-gpsd.c -+++ providers/gpsd/geoclue-gpsd.c -@@ -40,7 +40,12 @@ - #include <geoclue/gc-iface-position.h> - #include <geoclue/gc-iface-velocity.h> - -+#if GPSD_API_MAJOR_VERSION >= 5 -+/* gps_data conflicts with gps_data function */ -+typedef struct gps_data_t gps_data_l; -+#else - typedef struct gps_data_t gps_data; -+#endif - typedef struct gps_fix_t gps_fix; - - /* only listing used tags */ -@@ -59,7 +64,11 @@ - char *host; - char *port; - -+#if GPSD_API_MAJOR_VERSION >= 5 -+ gps_data_l *gpsdata; -+#else - gps_data *gpsdata; -+#endif - - gps_fix *last_fix; - -@@ -394,10 +403,16 @@ - static gboolean - geoclue_gpsd_start_gpsd (GeoclueGpsd *self) - { -+#if GPSD_API_MAJOR_VERSION >= 5 -+ int status = gps_open (self->host, self->port, self->gpsdata); -+ if (status == 0) { -+ gps_stream(self->gpsdata, WATCH_ENABLE | WATCH_NMEA, NULL); -+#else - self->gpsdata = gps_open (self->host, self->port); - if (self->gpsdata) { - gps_stream(self->gpsdata, WATCH_ENABLE | WATCH_NMEA | POLL_NONBLOCK, NULL); - gps_set_raw_hook (self->gpsdata, gpsd_raw_hook); -+#endif - return TRUE; - } else { - g_warning ("gps_open() failed, is gpsd running (host=%s,port=%s)?", self->host, self->port); -@@ -410,10 +425,23 @@ - { - GeoclueGpsd *self = (GeoclueGpsd*)data; - if (self->gpsdata) { -+#if GPSD_API_MAJOR_VERSION >= 5 -+ /* gps_poll and gps_set_raw_hook no longer present in this API version */ -+ if (gps_waiting(self->gpsdata, 500)) { -+ if (gps_read(self->gpsdata) == -1) { -+ geoclue_gpsd_set_status (self, GEOCLUE_STATUS_ERROR); -+ geoclue_gpsd_stop_gpsd(self); -+ return FALSE; -+ } else { -+ /* Call existing raw_hook to process the data */ -+ gpsd_raw_hook(self->gpsdata, NULL, 0); -+ } -+#else - if (gps_poll(self->gpsdata) < 0) { - geoclue_gpsd_set_status (self, GEOCLUE_STATUS_ERROR); - geoclue_gpsd_stop_gpsd(self); - return FALSE; -+#endif - } - } - return TRUE; diff --git a/app-misc/geoclue/geoclue-0.12.99.ebuild b/app-misc/geoclue/geoclue-0.12.99.ebuild deleted file mode 100644 index 2e7e56b9b28f..000000000000 --- a/app-misc/geoclue/geoclue-0.12.99.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -inherit autotools eutils - -DESCRIPTION="A geoinformation D-Bus service" -HOMEPAGE="https://freedesktop.org/wiki/Software/GeoClue" -SRC_URI="https://freedesktop.org/~hadess/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd" -IUSE="connman geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes skyhook static-libs yahoo-geo" - -REQUIRED_USE="skyhook? ( networkmanager )" - -RDEPEND=">=dev-libs/dbus-glib-0.100 - >=dev-libs/glib-2 - dev-libs/libxml2 - sys-apps/dbus - gps? ( sci-geosciences/gpsd ) - gtk? ( x11-libs/gtk+:2 ) - networkmanager? ( net-misc/networkmanager ) - skyhook? ( net-libs/libsoup )" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - virtual/pkgconfig" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-0.12.0_p20110307-use-flag.patch \ - "${FILESDIR}"/${PN}-0.12.0_p20110307-use-fallback-mac.patch \ - "${FILESDIR}"/${P}-gpsd.patch - - sed -i -e '/CFLAGS/s:-g ::' configure.ac || die #399177 - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die - eautoreconf -} - -src_configure() { - # Conic is only for Maemo. Don't enable. - # Gypsy has multiple vulnerabilities: - # https://bugs.freedesktop.org/show_bug.cgi?id=33431 - econf \ - --disable-silent-rules \ - $(use_enable static-libs static) \ - --disable-schemas-compile \ - $(use_enable gtk tests) \ - $(use_enable gtk) \ - --disable-conic \ - $(use_enable connman) \ - $(use_enable networkmanager) \ - --disable-gypsy \ - $(use_enable gps gpsd) \ - $(use_enable skyhook) \ - $(use_enable geonames) \ - $(use_enable gsmloc) \ - $(use_enable hostip) \ - $(use_enable manual) \ - $(use_enable nominatim) \ - $(use_enable plazes) \ - $(use_enable yahoo-geo yahoo) \ - --with-html-dir=/usr/share/doc/${PF}/html -} - -src_install() { - emake DESTDIR="${D}" install - use gtk && dobin test/.libs/geoclue-test-gui - prune_libtool_files -} diff --git a/app-misc/geoclue/geoclue-2.4.8.ebuild b/app-misc/geoclue/geoclue-2.4.8.ebuild index c8aefa01ac53..33986bfacb0f 100644 --- a/app-misc/geoclue/geoclue-2.4.8.ebuild +++ b/app-misc/geoclue/geoclue-2.4.8.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.x LICENSE="LGPL-2" SLOT="2.0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd" IUSE="+introspection +modemmanager zeroconf" RDEPEND=" diff --git a/app-misc/geoclue/metadata.xml b/app-misc/geoclue/metadata.xml index bd2c408ce28f..96f4b41efcb7 100644 --- a/app-misc/geoclue/metadata.xml +++ b/app-misc/geoclue/metadata.xml @@ -6,16 +6,7 @@ <name>Gentoo GNOME Desktop</name> </maintainer> <use> - <flag name="geonames">Install geonames.org provider</flag> - <flag name="gsmloc">Install GSM location provider</flag> - <flag name="gtk">Install gtk-based geoclue-test-gui</flag> - <flag name="hostip">Install hostip.info provder</flag> - <flag name="manual">Install manual provider</flag> <flag name="modemmanager">Enable geolocation through 3G or GPS enabled hardware through <pkg>net-misc/modemmanager</pkg>.</flag> - <flag name="nominatim">Install openstreetmap.org provider</flag> - <flag name="plazes">Install plazes.com provider</flag> - <flag name="skyhook">Install skyhookwireless.com provider</flag> - <flag name="yahoo-geo">Install Yahoo geolocation provider</flag> <flag name="zeroconf">Enable retrieval of GPS location from Android devices with https://wiki.gnome.org/Apps/GeoclueShare</flag> </use> </pkgmetadata> diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index 3d3980bc5681..40a4aab98546 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -6,6 +6,6 @@ DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc8 EBUILD mc-4.8.20-r1.ebuild 2489 BLAKE2B 36736aba7e7cf3a54445d09aa3ca89940eea27f75662e338a177de584007467466f57878aeedeeab17c3de3ed99d508b571c6e17cf3668ad4c40324832479e98 SHA512 357c2fee6e10147f5b85b9dd645010f7a04365fd5f3d3b0d18fe6a25a48ec4534f492f924a869402a05072c26817bdda80b61f3c0af20f6aaa06d21376dceb0d EBUILD mc-4.8.20-r2.ebuild 2626 BLAKE2B 7c91fffbe41d84790039342966abc75ba05c40ddde03148493be89bdd5e1c8bef88640d8f800d10c571bdc74ee09153138d6fc06e2ec9f58657eeda21084f580 SHA512 fb5e82276dc7a1fe0e36d0f8cc2209aefebbb677e247685c918fb0ffbd36c132ef154a5e20b3dde2de4fde0adcf4afe85bc152fdb6289e186cd5dde2ca721bbb EBUILD mc-4.8.21.ebuild 2432 BLAKE2B a7c051633f812a0817f1fe590feece7f8926798a0e8aff4580d695fb1ecee428a82d66e269cfb3e1c3a041e1643079abd1ba30291a4f1c87e4d0e185fa31ff4f SHA512 fd97e7bf3293fb22d3dfa17cac05d2ee229fcf05c8bf496ea03e08b626abedc1e2b33b41711b38ae1c5083480682540c99064c49fc7969acbb9de3b4fd2442f5 -EBUILD mc-4.8.22.ebuild 2426 BLAKE2B 43ae885288c699b4a1c20d85ca76137389a34dfc5ddb2d77e3e5850b87f734ffdf1fd15eee1dc2d2595bb2482c5547ecc09ff3e8ef4c487f71dd82650d9de203 SHA512 5723b0c73675be291ae2308abf5b5b686f84e22e39b9d6496e2869a26371d1e6f212a8928934367e1412581ec0fcc20aeecc844761e423eab7436748f66991e7 +EBUILD mc-4.8.22.ebuild 2423 BLAKE2B 9a130d2e5d451f1bf4290dd5b6781b5612beed093bbf912b18d5ae0f0d289a233a36d767d58f70496552bea6ad8c45c64e8d76c1dea645f9716f9af37d95f168 SHA512 4252a2e3cdd0b081aad94b110bd692886ffeca6e48ea4c56b8a40c081396cb095e4d96f6af93213cf6dd406a4373d4e93800248a6fef68a3fdbbbb36193c4007 EBUILD mc-9999.ebuild 2677 BLAKE2B 343e80aaeab6142e07612d179ed6639c4a6675211351c705f2ab2e52ae2c7cd268590e144f9c8cf7a4ef2e33255c3323b31f8d3e5cd365f99483918706924990 SHA512 4af49a3dfb63f3ac62bbb05ed9d35672685dd16f14e750656d4c2b7924807d324032221c73629f854b01a6263da32ba8ed018d244e1a04146b96fec6a753fa0a MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed diff --git a/app-misc/mc/mc-4.8.22.ebuild b/app-misc/mc/mc-4.8.22.ebuild index b64ac7df89dd..e2a128c7a3d3 100644 --- a/app-misc/mc/mc-4.8.22.ebuild +++ b/app-misc/mc/mc-4.8.22.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg" REQUIRED_USE="spell? ( edit )" diff --git a/app-misc/mmv/Manifest b/app-misc/mmv/Manifest index d1fb0d148841..ee8c96fa5840 100644 --- a/app-misc/mmv/Manifest +++ b/app-misc/mmv/Manifest @@ -1,4 +1,5 @@ DIST mmv_1.01b-18.debian.tar.gz 13463 BLAKE2B db67247bddd38580401d8b1a18aa9ce82af42a994bfe60141066aa08e19a01f35903cc1d8184cb4271ebe2a4a187607a7c5a6a750c121caafdf71fdc0ccb8896 SHA512 3543aff53c67cab00689d4c8b778447c976a7860a569bd51f74534bec8bd3b67b9e12743bd03bc6fda930748abddd12e16f1965686cbce04bd48bf191fc4127b DIST mmv_1.01b.orig.tar.gz 25656 BLAKE2B 4e3c7c27831fb5aeeb09461116330a993998da510b32a7ba3b1151c0d14a336eab7cf37bc3ac91720f38fb41258a60488e5d066b152d0c717f5413f8514d9026 SHA512 4bf4e096b930bdde225ba5de761e968af3aed33dc13194b1a1a79078cd27e158b04aae131b5167cf5f844e35355d67359443cd598db22da15a5af06752438917 +EBUILD mmv-1.01b_p18-r1.ebuild 1310 BLAKE2B d55e197178b1e783309eacaed5ecb19413748ac79d797cee91e6ab3166e61b44f07bdcc9a0d61873475b9e15fe5036b14c22a050b1ef0b2b8246083a95093604 SHA512 bab49c34f7c6371bdd0a9949694896f52f1f71f54fc6ba5e93fed1d16246523f743f3a00dd47a667a83374c5b19a3a7128a84abbfeb79fa0d4dab4a977ff83f1 EBUILD mmv-1.01b_p18.ebuild 1269 BLAKE2B 2c4faa9de91736679bcd6279ae8e1364733ba8da187ac5a3c16c622aebb7f3bdc91dcada98d6eaffc3aace7873f9b838b640ed39fb10a24ad60f7fe9e367da88 SHA512 11931b007cdfc09e01a5ca4478564c36ed2b73e83c267e29db2d788cefc63fd27e8f74dedf2d36aac882791a02b914533bde28748a7d58e7c7ce089912ca4625 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25 diff --git a/app-misc/mmv/mmv-1.01b_p18-r1.ebuild b/app-misc/mmv/mmv-1.01b_p18-r1.ebuild new file mode 100644 index 000000000000..44674eccd652 --- /dev/null +++ b/app-misc/mmv/mmv-1.01b_p18-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils flag-o-matic toolchain-funcs + +DEB_PATCH_VER=${PV#*_p} +MY_VER=${PV%_p*} + +DESCRIPTION="Move/copy/append/link multiple files according to a set of wildcard patterns" +HOMEPAGE="https://packages.debian.org/unstable/utils/mmv" +SRC_URI=" + mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}.orig.tar.gz + mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}-${DEB_PATCH_VER}.debian.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" + +S="${WORKDIR}/${PN}-${MY_VER}.orig" + +src_prepare() { + default + epatch "${WORKDIR}"/debian/patches/*.diff +} + +src_compile() { + # i wonder how this works on other platforms if CFLAGS from makefile are + # overridden, see bug #218082 + [[ ${CHOST} == *-interix* ]] && append-flags -DIS_SYSV -DHAS_RENAME -DHAS_DIRENT + [[ ${CHOST} == *-interix* ]] || append-lfs-flags + + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin "${PN}" + dosym "${PN}" /usr/bin/mcp + dosym "${PN}" /usr/bin/mln + dosym "${PN}" /usr/bin/mad + + doman "${PN}.1" + newman "${PN}.1" mcp.1 + newman "${PN}.1" mln.1 + newman "${PN}.1" mad.1 + + dodoc ANNOUNCE "${WORKDIR}"/debian/{changelog,control} +} diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest index c2c9a3ed2598..29cefff6c02d 100644 --- a/app-misc/pdfpc/Manifest +++ b/app-misc/pdfpc/Manifest @@ -3,5 +3,5 @@ DIST pdfpc-4.2.1.tar.gz 104515 BLAKE2B 96939731e4881e9dfadb5c00e449adaf8d3b88ca8 DIST pdfpc-4.3.0.tar.gz 107235 BLAKE2B 290a11f970ca16ea3ce3d724f1e62cd1b347b51dfc70162e61f80fb2ef630e18963c55ff99741c9c6a0fdd85c109371e660614b0af15b63dae524e21f534001c SHA512 a7e3efecd988ecdec8b0856a7a140ef8f6f3abcc56ecd7c1193f8b1c3723c9193fa3ea48dd9286d8c90d72983fc5a8ad75be7a40cd2c6196cc1361fa3c338ac0 EBUILD pdfpc-4.1.1.ebuild 1047 BLAKE2B 71e94a6c2e63ffaea3046a1426036ff859b2243f7b539a9239585de10a15d60810a1c7537e2f382ee763da14a0b58632a5f70d2bafb46fca772b838e0410891e SHA512 72167e26b6c82d643fb791bc19033d41df196d8f8ce3d5bb03ab5488785c0e3aec8f16c6d5d9e85fa23289bdd60d37e0fa59bf0060ee3c692c8b275c7b8b0002 EBUILD pdfpc-4.2.1.ebuild 1046 BLAKE2B fece2040846a3c1dcf45a3b20c6e0eb139160e3bdffbb4ef2aa1afcd20f80dfa2e15b6e10aece16eb1170a33adf1a11a1660eaf4b7afee647b090f0f609ccca9 SHA512 4d6bf8fce6f4b8a7446e093832537a9267a9d1078dc30eb20d3c6d6362a9cd539e24004b9036ae3ed9c464cd6ff2a6f059434a4012874b01c3cb8b8c99e8e1dd -EBUILD pdfpc-4.3.0.ebuild 1014 BLAKE2B 46634699fba67efd4fbf4f207db4935dc72c62498ee483fc6568cdad3b87cf36d840c1dc943f5ee76a02a89ca9bc2ab6c715ae698d5da5399dfb7f576b636408 SHA512 b253abd0ed7f3d1363a625c83a25bb0fb4c4fe1d32458ad43810330a9b821074586d7e4ad22a1d1d1786a0891db9496d01e1047a74ffc065bed864425f190d14 +EBUILD pdfpc-4.3.0.ebuild 1013 BLAKE2B c9bb4ffa6d50aa2e94d6655b34e298aa9a2be46d40ca7b9dd00b74ec10f21f4bac2e5133b3f30b6ca9a7f2e6aa72b9966449cbc84d5e19a416e2983c3d9e98de SHA512 71e63f9145b513474b0dee5cbcf5e26b70edd376dca642330d092aee92699e4a6de167c3b23c6876275dc70d3d6b467a0be249727a79e820ae15b42549b9c977 MISC metadata.xml 248 BLAKE2B 654fec0fee7061d757492fb099eaead728da33a2ae9cd4d062f8777b7a154898a212f16ba8432e0e2ebb5578ce57fdd536e715501972db07e906a866f65691f4 SHA512 55030b20a7a78b1738b2421cdb749e17c0704fa5b90109d83a4f81f09c177d2b27686e524935a63c8f1e7bd8f011a3a966d6ce336d335c2361fdd208763c28ef diff --git a/app-misc/pdfpc/pdfpc-4.3.0.ebuild b/app-misc/pdfpc/pdfpc-4.3.0.ebuild index 088a5dbcc8fb..c21761db0594 100644 --- a/app-misc/pdfpc/pdfpc-4.3.0.ebuild +++ b/app-misc/pdfpc/pdfpc-4.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="gstreamer" RDEPEND="app-text/poppler[cairo] diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest new file mode 100644 index 000000000000..75486b65c08b --- /dev/null +++ b/app-misc/tracker-miners/Manifest @@ -0,0 +1,6 @@ +AUX 2.1.5-meson-fixes.patch 16177 BLAKE2B 59c7ddaadb703612eadc500ba2cd60333d65f127e36a9dee4b60c65710b53e0cfdfa5b2829c8b334170e76e5eb37c1cc69c014150b928d7f897522f1141e1514 SHA512 d3bcb47e5e7449f9990d6aee261b72d943f61d610661652f18bda61270532591342a00c11b2de04b74744398b83a95c990271f1c7a7f07bfb5cf9db8f4c4b59a +AUX 2.1.5-seccomp.patch 1132 BLAKE2B e5f66ae4ab30b80fac96a54b58974a13a89f007e939c004680a163c98bc082dc710133443a7905bebaf71ace6f4138fbaf92586547c73da8da3d87f01d989b48 SHA512 7a5629dfd1854252c12066299bf5e3247524133dc54478fdadeeeb1b5945d2a3486a78f93223a56349be2539148a45046ffa5e6ec770ac3d203977de5a5392e6 +AUX 2.1.5-test-fix.patch 1710 BLAKE2B 4e22251796d78fbfd7b1503bcebb58d4c9361c9c98613575ac9cf560724a83a3d5e5168427b131c2916e5a9727668b83295fffe1a03b7eb503aaf4fcc136bfc9 SHA512 8ff2471fd2781cfa87b4fa08a0e5237e8610235795f773799019dbff59785bb010f167bebdce5545de67acc2c4a69674aa41968854e739bc260916d602754cbf +DIST tracker-miners-2.1.5.tar.xz 3455264 BLAKE2B 1e9149ae0767166fc8e936922e4e02d4391f7af3faf59525e32098fb10cb6c5f6970f13bdb35f675efc9f131672b3feb84cbdcd8d0f01c86d05880919fba463a SHA512 37bf6d44635843037613cfe681cd536a8b33ba34c092183d9d66289713deaaff5322d09028b447484e6bf72a01199c041fb295d6431d2f7cff3498ef8983f605 +EBUILD tracker-miners-2.1.5.ebuild 4297 BLAKE2B f13dfcb5cde8c191b44418b04eed32830516f0682fe4d6f2ed47bbe5d577d94484672b2e8f24c7930f45d849d8e36c7978349e10181786743a6fcd92bb90aafb SHA512 7170e2269da3affaaa03bd7f7ff7bbe9ed883d7b067a03fb05a740f9e7d059bc3e68c5d483bf2b5ca0c953537f3a7d16e62a362e03f97c0442709585c01e2caa +MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01 diff --git a/app-misc/tracker-miners/files/2.1.5-meson-fixes.patch b/app-misc/tracker-miners/files/2.1.5-meson-fixes.patch new file mode 100644 index 000000000000..c8a3e6358df8 --- /dev/null +++ b/app-misc/tracker-miners/files/2.1.5-meson-fixes.patch @@ -0,0 +1,322 @@ +From 5bb0709044fabe496601277ab5ba11a03500babe Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Fri, 15 Feb 2019 00:15:08 +0200 +Subject: [PATCH 1/5] build: Add feature options for all external deps + +Automagic dependencies are bad for distributions. Add feature options +for all of them that didn't have it before. If no options are specified, +the behavior matches with before, but now it's possible to specify +exactly what is linked to and what isn't. + +Fixes: #39 +--- + meson.build | 40 +++++++++++++++++++++------------------- + meson_options.txt | 37 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 58 insertions(+), 19 deletions(-) + +diff --git a/meson.build b/meson.build +index fd536f2e6..4f0e9a968 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,4 +1,6 @@ +-project('tracker-miners', 'c', 'vala', version: '2.1.5') ++project('tracker-miners', 'c', 'vala', ++ version: '2.1.5', ++ meson_version: '>=0.47') + + gnome = import('gnome') + i18n = import('i18n') +@@ -57,9 +59,9 @@ avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false) + avformat = dependency('libavformat', version: '>= 0.8.4', required: false) + avutil = dependency('libavutil', version: '>= 0.8.4', required: false) + dbus = dependency('dbus-1', version: '> 1.3.1') +-exempi = dependency('exempi-2.0', version: '> 2.1.0', required: false) +-flac = dependency('flac', version: '> 1.2.1', required: false) +-gexiv2 = dependency('gexiv2', required: false) ++exempi = dependency('exempi-2.0', version: '> 2.1.0', required: get_option('xmp')) ++flac = dependency('flac', version: '> 1.2.1', required: get_option('flac')) ++gexiv2 = dependency('gexiv2', required: get_option('raw')) + gio = dependency('gio-2.0', version: '>' + glib_required) + gio_unix = dependency('gio-unix-2.0', version: '>' + glib_required) + glib = dependency('glib-2.0', version: '>' + glib_required) +@@ -72,25 +74,25 @@ gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false) + gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '> 0.9.4', required: false) + icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false) + icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false) +-libcue = dependency('libcue', required: false) +-libexif = dependency('libexif', version: '> 0.6', required: false) +-libgsf = dependency('libgsf-1', version: '> 1.14.24', required: false) +-libgxps = dependency('libgxps', required: false) +-libiptcdata = dependency('libiptcdata', required: false) +-libjpeg = dependency('libjpeg', required: false) +-libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: false) +-libpng = dependency('libpng', version: '> 0.89', required: false) ++libcue = dependency('libcue', required: get_option('cue')) ++libexif = dependency('libexif', version: '> 0.6', required: get_option('exif')) ++libgsf = dependency('libgsf-1', version: '> 1.14.24', required: get_option('gsf')) ++libgxps = dependency('libgxps', required: get_option('xps')) ++libiptcdata = dependency('libiptcdata', required: get_option('iptc')) ++libjpeg = dependency('libjpeg', required: get_option('jpeg')) ++libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: get_option('iso')) ++libpng = dependency('libpng', version: '> 0.89', required: get_option('png')) + libseccomp = dependency('libseccomp', version: '>= 2.0', required: false) +-libtiff = dependency('libtiff-4', required: false) +-libxml2 = dependency('libxml-2.0', version: '> 2.6') +-libvorbis = dependency('vorbisfile', version: '> 0.22') +-poppler = dependency('poppler-glib', version: '> 0.16.0', required: false) +-taglib = dependency('taglib_c', version: '> 1.6', required: false) +-totem_plparser = dependency('totem-plparser', required: false) ++libtiff = dependency('libtiff-4', required: get_option('tiff')) ++libxml2 = dependency('libxml-2.0', version: '> 2.6', required: get_option('xml')) ++libvorbis = dependency('vorbisfile', version: '> 0.22', required: get_option('vorbis')) ++poppler = dependency('poppler-glib', version: '> 0.16.0', required: get_option('pdf')) ++taglib = dependency('taglib_c', version: '> 1.6', required: get_option('taglib')) ++totem_plparser = dependency('totem-plparser', required: get_option('playlist')) + upower = dependency('upower-glib', version: '> 0.9.0', required: false) + zlib = dependency('zlib') + +-libgif = cc.find_library('gif', required: false) ++libgif = cc.find_library('gif', required: get_option('gif')) + libmath = cc.find_library('m', required: false) + + # FIXME: here we work around a quirk todo with Meson and Vala: the 'uuid' +diff --git a/meson_options.txt b/meson_options.txt +index a91ac6c0f..5fce7a529 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -35,6 +35,43 @@ option('text', type: 'boolean', value: 'true', + option('unzip_ps_gz_files', type: 'boolean', value: 'true', + description: 'Enable extractor for PS.GZ metadata') + ++option('cue', type: 'feature', value: 'auto', ++ description: 'Support cue sheet parsing') ++option('exif', type: 'feature', value: 'auto', ++ description: 'Support EXIF metadata') ++option('flac', type: 'feature', value: 'auto', ++ description: 'Support extracting metadata from Flac audio') ++option('gif', type: 'feature', value: 'auto', ++ description: 'Support extracting metadata from GIF images') ++option('gsf', type: 'feature', value: 'auto', ++ description: 'Support extracting metadata from MS & Open Office documents') ++option('iptc', type: 'feature', value: 'auto', ++ description: 'Support IPTC photo metadata') ++option('iso', type: 'feature', value: 'auto', ++ description: 'Support ISO image parsing') ++option('jpeg', type: 'feature', value: 'auto', ++ description: 'Support extracting metadata from JPEG images') ++option('pdf', type: 'feature', value: 'auto', ++ description: 'Support extracting metadata from PDF documents') ++option('playlist', type: 'feature', value: 'auto', ++ description: 'Support extracting metadata from playlists (w/ Totem)') ++option('png', type: 'feature', value: 'auto', ++ description: 'Support extracting metadata from PNG images') ++option('raw', type: 'feature', value: 'auto', ++ description: 'Support extracting metadata from RAW photos') ++option('taglib', type: 'feature', value: 'auto', ++ description: 'Support writeback for audio files using Taglib') ++option('tiff', type: 'feature', value: 'auto', ++ description: 'Support extracting metadata from TIFF images') ++option('vorbis', type: 'feature', value: 'auto', ++ description: 'Support extracting metadata from Vorbis (ogg/etc) files') ++option('xml', type: 'feature', value: 'auto', ++ description: 'Support extracting metadata from XML and HTML documents') ++option('xmp', type: 'feature', value: 'auto', ++ description: 'Support XMP metadata') ++option('xps', type: 'feature', value: 'auto', ++ description: 'Support extracting metadata from XPS documents') ++ + option('battery_detection', type: 'combo', choices: ['auto', 'hal', 'upower', 'none'], value: 'auto', + description: 'Enable upower or HAL for battery/mains power detection') + option('charset_detection', type: 'combo', choices: ['auto', 'enca', 'icu', 'none'], value: 'auto', +-- +2.17.0 + + +From b8c1768696c13275f5896374907fa192140ec922 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Fri, 15 Feb 2019 00:18:09 +0200 +Subject: [PATCH 2/5] build: Fix minimum dep checks to allow the specified + version too + +Many of the minimum deps were expressed as "> x.y", but were meant to +allow x.y itself as well. Change all to ">= x.y". This seems to be +what was intended and was the case with autotools. +--- + meson.build | 44 ++++++++++++++++++++++---------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) + +diff --git a/meson.build b/meson.build +index 4f0e9a968..4263faf95 100644 +--- a/meson.build ++++ b/meson.build +@@ -58,38 +58,38 @@ endif + avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false) + avformat = dependency('libavformat', version: '>= 0.8.4', required: false) + avutil = dependency('libavutil', version: '>= 0.8.4', required: false) +-dbus = dependency('dbus-1', version: '> 1.3.1') +-exempi = dependency('exempi-2.0', version: '> 2.1.0', required: get_option('xmp')) +-flac = dependency('flac', version: '> 1.2.1', required: get_option('flac')) ++dbus = dependency('dbus-1', version: '>= 1.3.1') ++exempi = dependency('exempi-2.0', version: '>= 2.1.0', required: get_option('xmp')) ++flac = dependency('flac', version: '>= 1.2.1', required: get_option('flac')) + gexiv2 = dependency('gexiv2', required: get_option('raw')) +-gio = dependency('gio-2.0', version: '>' + glib_required) +-gio_unix = dependency('gio-unix-2.0', version: '>' + glib_required) +-glib = dependency('glib-2.0', version: '>' + glib_required) +-gmodule = dependency('gmodule-2.0', version: '>' + glib_required) +-gobject = dependency('gobject-2.0', version: '>' + glib_required) ++gio = dependency('gio-2.0', version: '>=' + glib_required) ++gio_unix = dependency('gio-unix-2.0', version: '>=' + glib_required) ++glib = dependency('glib-2.0', version: '>=' + glib_required) ++gmodule = dependency('gmodule-2.0', version: '>=' + glib_required) ++gobject = dependency('gobject-2.0', version: '>=' + glib_required) + gstreamer = dependency('gstreamer-1.0', required: false) + gstreamer_pbutils = dependency('gstreamer-pbutils-1.0', required: false) + gstreamer_tag = dependency('gstreamer-tag-1.0', required: false) +-gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false) +-gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '> 0.9.4', required: false) +-icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false) +-icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false) ++gupnp_dlna = dependency('gupnp-dlna-2.0', version: '>= 0.9.4', required: false) ++gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '>= 0.9.4', required: false) ++icu_i18n = dependency('icu-i18n', version: '>= 4.8.1.1', required: false) ++icu_uc = dependency('icu-uc', version: '>= 4.8.1.1', required: false) + libcue = dependency('libcue', required: get_option('cue')) +-libexif = dependency('libexif', version: '> 0.6', required: get_option('exif')) +-libgsf = dependency('libgsf-1', version: '> 1.14.24', required: get_option('gsf')) ++libexif = dependency('libexif', version: '>= 0.6', required: get_option('exif')) ++libgsf = dependency('libgsf-1', version: '>= 1.14.24', required: get_option('gsf')) + libgxps = dependency('libgxps', required: get_option('xps')) + libiptcdata = dependency('libiptcdata', required: get_option('iptc')) + libjpeg = dependency('libjpeg', required: get_option('jpeg')) +-libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: get_option('iso')) +-libpng = dependency('libpng', version: '> 0.89', required: get_option('png')) ++libosinfo = dependency('libosinfo-1.0', version: '>= 0.2.9', required: get_option('iso')) ++libpng = dependency('libpng', version: '>= 0.89', required: get_option('png')) + libseccomp = dependency('libseccomp', version: '>= 2.0', required: false) + libtiff = dependency('libtiff-4', required: get_option('tiff')) +-libxml2 = dependency('libxml-2.0', version: '> 2.6', required: get_option('xml')) +-libvorbis = dependency('vorbisfile', version: '> 0.22', required: get_option('vorbis')) +-poppler = dependency('poppler-glib', version: '> 0.16.0', required: get_option('pdf')) +-taglib = dependency('taglib_c', version: '> 1.6', required: get_option('taglib')) ++libxml2 = dependency('libxml-2.0', version: '>= 2.6', required: get_option('xml')) ++libvorbis = dependency('vorbisfile', version: '>= 0.22', required: get_option('vorbis')) ++poppler = dependency('poppler-glib', version: '>= 0.16.0', required: get_option('pdf')) ++taglib = dependency('taglib_c', version: '>= 1.6', required: get_option('taglib')) + totem_plparser = dependency('totem-plparser', required: get_option('playlist')) +-upower = dependency('upower-glib', version: '> 0.9.0', required: false) ++upower = dependency('upower-glib', version: '>= 0.9.0', required: false) + zlib = dependency('zlib') + + libgif = cc.find_library('gif', required: get_option('gif')) +@@ -143,7 +143,7 @@ elif get_option('battery_detection') == 'upower' + endif + + if battery_detection_library_name == '' +- hal = dependency('hal', version: '> 0.5', required: false) ++ hal = dependency('hal', version: '>= 0.5', required: false) + + if hal.found() + battery_detection_library = hal +-- +2.17.0 + + +From 6a215b9088abb9df4a837c1b74f281454f286ddf Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Fri, 15 Feb 2019 01:11:23 +0200 +Subject: [PATCH 3/5] build: Remove unnecessary vala language dependency + +tracker-miners doesn't use any vala, but due to vala declared as +a used language it does error out if valac isn't found. Remove the +language and unused vapi helper variable. +--- + meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 4263faf95..bfd2d624b 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,4 +1,4 @@ +-project('tracker-miners', 'c', 'vala', ++project('tracker-miners', 'c', + version: '2.1.5', + meson_version: '>=0.47') + +@@ -385,7 +385,6 @@ tracker_writeback_modules_dir = join_paths(get_option('prefix'), get_option('lib + tracker_uninstalled_extract_rules_dir = join_paths(meson.current_build_dir(), 'src', 'tracker-extract') + + gsettings_schema_dir = join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas') +-vapi_dir = join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi') + + glib_mkenums = find_program('glib-mkenums') + +-- +2.17.0 + + +From a163936b590184291c6ac6b8365eb5f7e9bf3474 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Fri, 15 Feb 2019 01:12:25 +0200 +Subject: [PATCH 4/5] build: Remove unnecessary uuid util-linux hard dependency + +tracker core might use uuid, but nothing in tracker-miners needs it +--- + meson.build | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/meson.build b/meson.build +index bfd2d624b..8d23a1157 100644 +--- a/meson.build ++++ b/meson.build +@@ -95,14 +95,6 @@ zlib = dependency('zlib') + libgif = cc.find_library('gif', required: get_option('gif')) + libmath = cc.find_library('m', required: false) + +-# FIXME: here we work around a quirk todo with Meson and Vala: the 'uuid' +-# pkg-config component corresponds to 'libuuid.vapi', but Meson assumes that +-# .vapi name always matches pkg-config name, and will add `--pkg uuid` to the +-# Vala commandline. By finding 'uuid' using find_library() instead, we get +-# a dependency object back that won't cause any `--pkg` arguments to be added +-# to the Vala commandline, but still works as expected for C code. +-uuid = cc.find_library('uuid') +- + have_tracker_extract = get_option('extract') + have_tracker_miner_apps = get_option('miner_apps') + have_tracker_miner_fs = get_option('miner_fs') +-- +2.17.0 + + +From cc87c22592868e700333f31f333bf850c89f0135 Mon Sep 17 00:00:00 2001 +From: Sam Thursfield <sam@afuera.me.uk> +Date: Sun, 7 Oct 2018 23:42:28 +0200 +Subject: [PATCH 5/5] build: Fix breakage when libcue isn't found + +Commit 6e281037a5f0abc introduced a regression on systems where libcue +is not available. + +Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/33 + +(cherry picked from commit fd0eb3cd98f279591cbe8635eadf42027dd5ddae) +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 8d23a1157..d69588435 100644 +--- a/meson.build ++++ b/meson.build +@@ -303,7 +303,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer') + conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA') + conf.set('HAVE_HAL', battery_detection_library_name == 'hal') + conf.set('HAVE_LIBCUE', libcue.found()) +-conf.set('HAVE_LIBCUE2', libcue.version() >= '2.0.0') ++conf.set('HAVE_LIBCUE2', libcue.found() and libcue.version().version_compare('>= 2.0.0')) + conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu') + conf.set('HAVE_LIBEXIF', libexif.found()) + conf.set('HAVE_LIBIPTCDATA', libiptcdata.found()) +-- +2.17.0 + diff --git a/app-misc/tracker-miners/files/2.1.5-seccomp.patch b/app-misc/tracker-miners/files/2.1.5-seccomp.patch new file mode 100644 index 000000000000..f32d698a4873 --- /dev/null +++ b/app-misc/tracker-miners/files/2.1.5-seccomp.patch @@ -0,0 +1,42 @@ +From b2d4b05a0c9e34b88aaf55b9f52497b07af8e862 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Fri, 15 Feb 2019 21:11:29 +0200 +Subject: [PATCH] build: Only require seccomp when the CPU architecture + supports it + +--- + meson.build | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index ef48e77a6..65ad19cad 100644 +--- a/meson.build ++++ b/meson.build +@@ -261,7 +261,23 @@ endif + # Check for libseccomp + ################################################################## + +-if not libseccomp.found() and host_machine.system() == 'linux' ++host_system = host_machine.system() ++host_cpu = host_machine.cpu() ++unsupported_cpus = [ ++ 'alpha', ++ 'ia64', ++ 'm68k', ++ 'parisc', ++ 'parisc64', ++ 'sh4', ++ 'sparc', ++ 'sparc64', ++] ++system_supports_seccomp = host_system == 'linux' ++cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu) ++seccomp_required = system_supports_seccomp and cpu_supports_seccomp ++ ++if not libseccomp.found() and seccomp_required + error('Libseccomp is mandatory for sandboxed metadata extraction') + endif + +-- +2.17.0 + diff --git a/app-misc/tracker-miners/files/2.1.5-test-fix.patch b/app-misc/tracker-miners/files/2.1.5-test-fix.patch new file mode 100644 index 000000000000..be979e6af057 --- /dev/null +++ b/app-misc/tracker-miners/files/2.1.5-test-fix.patch @@ -0,0 +1,50 @@ +From 02a54749117d609d75bad80331024661c2e598ce Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Fri, 15 Feb 2019 12:20:39 +0200 +Subject: [PATCH] libtracker-miners-common: improve path_evaluate_name + environment handling + +Under some environments $PWD might not point where we expect, so simply +use g_get_current_dir() instead. +g_getenv() is documented to return a pointer that may get overwritten +by subsequent calls to g_getenv, g_setenv of g_unsetenv. As even after +removing the second g_getenv, there's still g_setenv calls, take a copy. +--- + .../libtracker-miners-common/tracker-file-utils-test.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/tests/libtracker-miners-common/tracker-file-utils-test.c b/tests/libtracker-miners-common/tracker-file-utils-test.c +index 93b94472c..3f86a0cdc 100644 +--- a/tests/libtracker-miners-common/tracker-file-utils-test.c ++++ b/tests/libtracker-miners-common/tracker-file-utils-test.c +@@ -134,14 +134,14 @@ test_path_list_filter_duplicates_with_exceptions () + static void + test_path_evaluate_name (void) + { +- gchar *result, *expected; +- +- const gchar *home = g_getenv ("HOME"); +- const gchar *pwd = g_getenv ("PWD"); ++ gchar *result, *expected, *home, *pwd; + + const gchar *test = "/one/two"; + gchar *parent_dir; + ++ home = g_strdup (g_getenv ("HOME")); ++ pwd = g_get_current_dir (); ++ + g_setenv ("TEST_TRACKER_DIR", test, TRUE); + + +@@ -219,6 +219,8 @@ test_path_evaluate_name (void) + result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ()); + g_assert_cmpstr (result, ==, tracker_test_helpers_get_nonutf8 ()); + ++ g_free (home); ++ g_free (pwd); + g_unsetenv ("TEST_TRACKER_DIR"); + } + +-- +2.17.0 + diff --git a/app-misc/tracker-miners/metadata.xml b/app-misc/tracker-miners/metadata.xml new file mode 100644 index 000000000000..82957eafdf0d --- /dev/null +++ b/app-misc/tracker-miners/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="cue">Enable cue sheet parsing</flag> + <flag name="gsf">Enable <pkg>gnome-extra/libgsf</pkg> based data extractor and + for ODT.</flag> + <flag name="iptc">Enable extraction of IPTC data from pictures</flag> + <flag name="iso">Enable extraction of metadata from ISO disk images</flag> + <flag name="playlist">Add support for playlists</flag> + <flag name="xps">Add support for XPS file format through <pkg>app-text/libgxps</pkg>.</flag> + </use> +</pkgmetadata> diff --git a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild new file mode 100644 index 000000000000..92999f830e52 --- /dev/null +++ b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) + +inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg + +DESCRIPTION="Collection of data extractors for Tracker/Nepomuk" +HOMEPAGE="https://wiki.gnome.org/Projects/Tracker" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +IUSE="cue exif ffmpeg flac gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist raw +rss seccomp test +taglib +tiff upower +vorbis +xml xmp xps" + +REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred) +RDEPEND=" + >=dev-libs/glib-2.46:2 + >=app-misc/tracker-2.1.0:= + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 ) + !gstreamer? ( + ffmpeg? ( + libav? ( media-video/libav:0= ) + !libav? ( media-video/ffmpeg:0= ) ) ) + + >=sys-apps/dbus-1.3.1 + xmp? ( >=media-libs/exempi-2.1.0:= ) + flac? ( >=media-libs/flac-1.2.1 ) + raw? ( media-libs/gexiv2 ) + >=dev-libs/icu-4.8.1.2:= + cue? ( media-libs/libcue ) + exif? ( >=media-libs/libexif-0.6 ) + gsf? ( >=gnome-extra/libgsf-1.14.24:= ) + xps? ( app-text/libgxps ) + iptc? ( media-libs/libiptcdata ) + jpeg? ( virtual/jpeg:0 ) + iso? ( >=sys-libs/libosinfo-0.2.10 ) + >=media-libs/libpng-1.2:0= + seccomp? ( >=sys-libs/libseccomp-2.0 ) + tiff? ( media-libs/tiff:0 ) + xml? ( >=dev-libs/libxml2-2.6 ) + vorbis? ( >=media-libs/libvorbis-0.22 ) + pdf? ( >=app-text/poppler-0.16.0[cairo] ) + taglib? ( >=media-libs/taglib-1.6 ) + playlist? ( >=dev-libs/totem-pl-parser-3:= ) + upower? ( >=sys-power/upower-0.9.0 ) + sys-libs/zlib:0 + gif? ( media-libs/giflib:= ) + + rss? ( >=net-libs/libgrss-0.7:0 ) + app-arch/gzip +" +DEPEND="${RDEPEND} + dev-util/glib-utils + + >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( ${PYTHON_DEPS} ) +" +# intltool-merge manually called in meson.build in 2.1.5; might be properly gone by 2.2.0 (MR !29) + +PATCHES=( + "${FILESDIR}"/${PV}-meson-fixes.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/49 + "${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/50 + "${FILESDIR}"/${PV}-seccomp.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/51 +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + xdg_src_prepare + gnome2_environment_reset # sets gstreamer safety variables +} + +src_configure() { + local media_extractor="none" + if use gstreamer ; then + media_extractor="gstreamer" + elif use ffmpeg ; then + media_extractor="libav" + fi + + local emesonargs=( + -Dtracker_core=system + + -Ddocs=true + -Dextract=true + $(meson_use test functional_tests) + -Dminer_apps=true + -Dminer_fs=true + $(meson_use rss miner_rss) + -Dwriteback=true + -Dabiword=true + -Ddvi=true + -Dicon=true + -Dmp3=true + -Dps=true + -Dtext=true + -Dunzip_ps_gz_files=true # spawns gunzip + + -Dcue=$(usex cue enabled disabled) + -Dexif=$(usex exif enabled disabled) + -Dflac=$(usex flac enabled disabled) + -Dgif=$(usex gif enabled disabled) + -Dgsf=$(usex gsf enabled disabled) + -Diptc=$(usex iptc enabled disabled) + -Diso=$(usex iso enabled disabled) + -Djpeg=$(usex jpeg enabled disabled) + -Dpdf=$(usex pdf enabled disabled) + -Dplaylist=$(usex playlist enabled disabled) + -Dpng=enabled + -Draw=$(usex raw enabled disabled) + -Dtaglib=$(usex taglib enabled disabled) + -Dtiff=$(usex tiff enabled disabled) + -Dvorbis=$(usex vorbis enabled disabled) + -Dxml=$(usex xml enabled disabled) + -Dxmp=$(usex xmp enabled disabled) + -Dxps=$(usex xps enabled disabled) + + -Dbattery_detection=$(usex upower upower none) + -Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca + -Dgeneric_media_extractor=${media_extractor} + # gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default + -Dsystemd_user_services="$(systemd_get_userunitdir)" + ) + meson_src_configure +} + +src_test() { + dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' +} diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest index b43b8fe382a4..20249aa73a8f 100644 --- a/app-misc/tracker/Manifest +++ b/app-misc/tracker/Manifest @@ -1,3 +1,11 @@ +AUX 2.1.7-doc-options.patch 2121 BLAKE2B 08344eae558de800f1081c7a12a3b373915adf94881fc9f72eb6ef86a7cb23daff01fb1d970bfff96f016e4347ad350d2637f1a06b425507bf56f92d92eec165 SHA512 f32f432751ac92d92bd8e83f5252af7b347cd08eb0c6c5e8c5582ad343856ac45a293d5f15adae7167cf216e4b0ac24ab1e298711c478638750ae8a697c4363c +AUX 2.1.7-fix-library-symlinks.patch 2937 BLAKE2B f26621b37fbd3f4e58289b8182bf56afcef760d6aceaa5b286389676c27dc529f62b5b4be26dd7ba28d6cbe865cf1d0e3e0b0c76bd4e026cfeff25b63b7d98a3 SHA512 0ddadfebdd8f3b8275b9f16c110e63c557549cc903e0fe8b2df4975fb69d3c529bfa6e7a4f7e78dfca2845b6b6b561a5d608bc139e74d45788d0bed477bb5eaf +AUX 2.1.7-glib-2.60-compat.patch 7341 BLAKE2B 64a322db244551b15c037aaca8f868ced632c25600e1e7c83a22eb532535e9d4eb317e0f9aa0df8b52c86077af839dcfba2f4846e91a37e42d325b7681379b98 SHA512 d14c760626541e3ac0cce55bd837a5ca4a0e627d43aea491d1f1cbbca0ab445317519506a2ae2a22416b39ce9708926683ac9dd3be244d9ae2eb53e5b2675f8d +AUX 2.1.7-prevent-stack-smashing.patch 1669 BLAKE2B 8c0e603f8c2aafe0cb2b381feaf5c7f87afdfde764f1940735617cbad12afc02e25df9b9a848a580d4e5b969cd0f55b889ba50f5618c33cb9f9e5966d82ea996 SHA512 0d7374605e6221f14877539db2e17d4536ce45adc25d76adfb78043d3d699a291a213aeccd4e0bc4338a10454bb93c47270cfc525b258bf2a1029e856c1b47a9 +AUX 2.1.7-test-fix.patch 1674 BLAKE2B 5e0ff6c8d8ece11ec49c818521fbb248c13e09b14860b33e93229f41db36779aebeb3b398fc3d4c590332280cd98e756787755c54b2a600e031abe45746fbe26 SHA512 588eacbe421355b252cb98d00ef67b0205b6c9437e58ff893da822732d338cf453583b0cde3b71940c5dd24d562b0aa32cd7c0f7bd978c382eddb77527adc3f2 +AUX 2.1.7-upgrade-path-fix.patch 1251 BLAKE2B ea343e15348ddfe8a8a36fc9060d14dc5e8ec2a777e473ab39041692d67c4a5c0ebd8793f6896b49e2c353c25167b5dc42e167222f566757fdd9504d2906928b SHA512 965055c9526fa523d11b77c6bb3bddaa1323dd06d5cccb2f638f89402380b746e11e60f828ecfb4b35e20715a97f940980edbb6a6d2416356c4a84da0ac476c4 DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1 -EBUILD tracker-1.12.4.ebuild 7571 BLAKE2B 7077e2536921cbf564bf92e9ec226f9e10379567f0d47dd89fbfcd1bc8318d4c286e100c759a4f8b9a2d696330748dfa4b973236fbf5c498413c3a0654603c1b SHA512 4ddf3e6d98f74601af816a3a404a06934faff2aec56f3fda2613c915997c8dc5868bca417a3ff7f1d4b5073eed7ddf768e8f947b8f85a46a58b5c60c87ba3c58 -MISC metadata.xml 1561 BLAKE2B ce0e9984983c7e0f249af4d375361f64236fb38d105b9ce2cee6c12519c70d4e8c7801a6000adfe777b2f9bb787c47779246b148dbbb5ec6fb6e94356413d8d3 SHA512 89deedce6c26547cdc8a2b3ff1880662125b73f490293156904a942acf632e1325dbc3657cdd6a1ca53cdb7556adbd96fea2705759a0a5503e80ae95d90045c4 +DIST tracker-2.1.7.tar.xz 2572740 BLAKE2B 0db8379502a37d0fc0c4b905a55a8642011c76368a94609b71afa5b6d59fa8a9220c302588a8217ea8626faccedd6b62e8fc96b19d4fb2cbaf1b550fbc55cf0d SHA512 75203af91ec43641caf2a3870100b8c5affb613e442e5a271edafe68ac7c6551256f288e435ce4fc8cb6f9ee0ea54871ebba90e085d0baeba4914815d3be15a0 +EBUILD tracker-1.12.4-r1.ebuild 7448 BLAKE2B b1552ee19ab27c1a2fb7ec5fa43de63f53f88da98d77772c979a4941bcff54299d991e20f432155652152d1b3315ffc64eaeed9073261c2f428c334f5f576e41 SHA512 b84d10c8f9979fe3e66007c7e20b229d181c9e1961a92aa70500c6461197ac4a976cc7849e4901107bb4aedb3195540ec12e577f9ab368ea4aa10059ddcf3131 +EBUILD tracker-2.1.7-r1.ebuild 2921 BLAKE2B 9632ed938972d26a439fb6891875cd3174118114b9344a2eef2e8e10f0392efcea50c055a61a3a9cc13e1bb7d75e51bb060ee5d9db3acacd00c3885ae5e58c29 SHA512 aee64e41dbf027436257a7ad391f1bb506314876d1038a20f700c062c4fa64ac9c7aacca1fd94ac8f5bd3cf43d4d139411f01868ffe732318abaf48f634ba970 +MISC metadata.xml 1545 BLAKE2B 1fee1210e27ad5a33c7e121372a64ed7d70c5c8169ce7b2688ff395cb56a218d53a8c5561701498d52d7772be1ce77d44275c938ad9486dc039e2f301bb14b6d SHA512 b379f0ca9737f7847ec7e0e83148ef354a56433d5fcd45996feaa86d9773c60b97f226ca21aba48aaba31f17ead8ea1922d408193328f477d58449ed3a732f71 diff --git a/app-misc/tracker/files/2.1.7-doc-options.patch b/app-misc/tracker/files/2.1.7-doc-options.patch new file mode 100644 index 000000000000..9b25349f659f --- /dev/null +++ b/app-misc/tracker/files/2.1.7-doc-options.patch @@ -0,0 +1,66 @@ +From cff7f988fd2ed7894c3d16144e799d994637d3cf Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Wed, 13 Feb 2019 12:28:53 +0200 +Subject: [PATCH 1/5] build: Separate options for manpages install and gtk-doc + generation +--- + docs/meson.build | 10 +++++++--- + meson.build | 6 +----- + meson_options.txt | 6 ++++-- + 3 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/docs/meson.build b/docs/meson.build +index 76e59797e..5e1d541bd 100644 +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -1,3 +1,7 @@ +-subdir('tools') +-subdir('manpages') +-subdir('reference') ++if get_option('man') ++ subdir('manpages') ++endif ++if get_option('gtk-doc') ++ subdir('tools') ++ subdir('reference') ++endif +diff --git a/meson.build b/meson.build +index 7d61fe1a7..0fda24151 100644 +--- a/meson.build ++++ b/meson.build +@@ -320,11 +320,7 @@ typelib_dir = gobject_introspection.get_pkgconfig_variable('typelibdir', + define_variable: [ 'libdir', libdir ]) + + subdir('src') +- +-if get_option('docs') +- subdir('docs') +-endif +- ++subdir('docs') + subdir('examples') + subdir('utils') + +diff --git a/meson_options.txt b/meson_options.txt +index b36ba1d1e..0eb48aac4 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,11 +1,13 @@ +-option('docs', type: 'boolean', value: true, +- description: 'Enable the documentation') + option('fts', type: 'boolean', value: true, + description: 'Enable the Tracker full-text search feature') + option('functional_tests', type: 'boolean', value: true, + description: 'Enable the Tracker functional test suite') ++option('gtk-doc', type: 'boolean', value: true, ++ description: 'Generate API documentation with gtk-doc') + option('journal', type: 'boolean', value: true, + description: 'Enable database journal backup mechanism') ++option('man', type: 'boolean', value: true, ++ description: 'Install man pages') + + option('network_manager', type: 'combo', choices: ['auto', 'no', 'yes'], value: 'auto', + description: 'Enable connection detection through NetworkManager') +-- +2.17.0 + diff --git a/app-misc/tracker/files/2.1.7-fix-library-symlinks.patch b/app-misc/tracker/files/2.1.7-fix-library-symlinks.patch new file mode 100644 index 000000000000..85ddb6baa22b --- /dev/null +++ b/app-misc/tracker/files/2.1.7-fix-library-symlinks.patch @@ -0,0 +1,71 @@ +From d52a7bed9fdeef77bdcafd66c748adce14fde42d Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Tue, 6 Nov 2018 07:11:37 +0000 +Subject: [PATCH 5/5] build: Restore right soversion to libraries + +The previous change did not leave the expected .0 symlinks. + +'soversion' is the actual version linked against. To match the scheme +used by libtool, we need to give the libraries a 'version' as well. + +(cherry picked from commit 282cd5aa85852cc7f9e603dae435f6b528c4712a) +--- + meson.build | 3 ++- + src/libtracker-control/meson.build | 1 + + src/libtracker-miner/meson.build | 1 + + src/libtracker-sparql-backend/meson.build | 1 + + 4 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 0fda24151..593b9db44 100644 +--- a/meson.build ++++ b/meson.build +@@ -15,7 +15,8 @@ tracker_interface_age = 0 + tracker_binary_age = 100 * tracker_minor_version + tracker_micro_version - tracker_interface_age + + # This the .Z used in libtracker-sparql-2.0.so.Z +-soversion = '0.@0@.@1@'.format(tracker_binary_age - tracker_interface_age, tracker_interface_age) ++soversion = '0' ++libversion = '@0@.@1@.@2@'.format(soversion, tracker_binary_age - tracker_interface_age, tracker_interface_age) + + libdir = join_paths(get_option('prefix'), get_option('libdir')) + datadir = join_paths(get_option('prefix'), get_option('datadir')) +diff --git a/src/libtracker-control/meson.build b/src/libtracker-control/meson.build +index 81578e306..533ac538e 100644 +--- a/src/libtracker-control/meson.build ++++ b/src/libtracker-control/meson.build +@@ -10,6 +10,7 @@ libtracker_control = library('tracker-control-' + tracker_api_version, + tracker_common_enum_header, + c_args: tracker_c_args, + soversion: soversion, ++ version: libversion, + install: true, + install_rpath: tracker_internal_libs_dir, + # This doesn't depend on tracker_common_dep because of +diff --git a/src/libtracker-miner/meson.build b/src/libtracker-miner/meson.build +index e53b21cf9..49c879057 100644 +--- a/src/libtracker-miner/meson.build ++++ b/src/libtracker-miner/meson.build +@@ -60,6 +60,7 @@ libtracker_miner = library( + miner_enums[0], miner_enums[1], miner_sources, + c_args: tracker_c_args, + soversion: soversion, ++ version: libversion, + install: true, + install_rpath: tracker_internal_libs_dir, + # This doesn't depend on tracker_common_dep because of +diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build +index c8415efb8..e54333bec 100644 +--- a/src/libtracker-sparql-backend/meson.build ++++ b/src/libtracker-sparql-backend/meson.build +@@ -8,6 +8,7 @@ libtracker_sparql = library('tracker-sparql-' + tracker_api_version, + 'tracker-backend.vala', + + soversion: soversion, ++ version: libversion, + + install: true, + install_rpath: tracker_internal_libs_dir, +-- +2.17.0 + diff --git a/app-misc/tracker/files/2.1.7-glib-2.60-compat.patch b/app-misc/tracker/files/2.1.7-glib-2.60-compat.patch new file mode 100644 index 000000000000..93737f79857d --- /dev/null +++ b/app-misc/tracker/files/2.1.7-glib-2.60-compat.patch @@ -0,0 +1,169 @@ +From 43b10233d4cce38230c357d885662291d2e5e978 Mon Sep 17 00:00:00 2001 +From: Iain Lane <iainl@gnome.org> +Date: Mon, 11 Feb 2019 15:42:14 +0000 +Subject: [PATCH 4/5] libtracker-data: Don't rely on hash table iteration order + being stable + +This is the same problem that was fixed by +c58f7aa419e2c3a69fa7fe583a1fd5e0b9bd0839 on master. Instead of relying +on hash table iteration being stable, pass the GVariantBuilder down and +add directly to it in the right order. + +Forwarded: https://gitlab.gnome.org/GNOME/tracker/merge_requests/55 +--- + .../tracker-sparql-pattern.vala | 4 +-- + src/libtracker-data/tracker-sparql-query.vala | 31 ++++++++++++------- + 2 files changed, 21 insertions(+), 14 deletions(-) + +diff --git a/src/libtracker-data/tracker-sparql-pattern.vala b/src/libtracker-data/tracker-sparql-pattern.vala +index e03ed6f16..033b138a5 100644 +--- a/src/libtracker-data/tracker-sparql-pattern.vala ++++ b/src/libtracker-data/tracker-sparql-pattern.vala +@@ -542,7 +542,7 @@ class Tracker.Sparql.Pattern : Object { + } else if (accept (SparqlTokenType.BLANK_NODE)) { + // _:foo + expect (SparqlTokenType.COLON); +- result = query.generate_bnodeid (get_last_string ().substring (1)); ++ result = query.generate_bnodeid (get_last_string ().substring (1), null); + } else if (current () == SparqlTokenType.STRING_LITERAL1) { + result = expression.parse_string_literal (); + } else if (current () == SparqlTokenType.STRING_LITERAL2) { +@@ -569,7 +569,7 @@ class Tracker.Sparql.Pattern : Object { + } else if (current () == SparqlTokenType.OPEN_BRACKET) { + next (); + +- result = query.generate_bnodeid (null); ++ result = query.generate_bnodeid (null, null); + + string old_subject = current_subject; + bool old_subject_is_var = current_subject_is_var; +diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala +index 7944e78e5..69a7e9eba 100644 +--- a/src/libtracker-data/tracker-sparql-query.vala ++++ b/src/libtracker-data/tracker-sparql-query.vala +@@ -284,7 +284,7 @@ public class Tracker.Sparql.Query : Object { + sha1, sha1.substring (8), sha1.substring (12), sha1.substring (16), sha1.substring (20)); + } + +- internal string generate_bnodeid (string? user_bnodeid) { ++ internal string generate_bnodeid (string? user_bnodeid, GLib.VariantBuilder? builder) { + // user_bnodeid is NULL for anonymous nodes + if (user_bnodeid == null) { + return ":%d".printf (++bnodeid); +@@ -310,6 +310,9 @@ public class Tracker.Sparql.Query : Object { + } + + blank_nodes.insert (user_bnodeid, uri); ++ ++ if (builder != null) ++ builder.add ("{ss}", user_bnodeid, uri); + } + + return uri; +@@ -774,7 +777,7 @@ public class Tracker.Sparql.Query : Object { + for (int i = 0; i < n_solutions; i++) { + solution.solution_index = i; + set_location (delete_location); +- parse_construct_triples_block (solution, UpdateType.DELETE); ++ parse_construct_triples_block (solution, UpdateType.DELETE, null); + data_update.update_buffer_might_flush (); + } + +@@ -790,16 +793,20 @@ public class Tracker.Sparql.Query : Object { + for (int i = 0; i < n_solutions; i++) { + uuid_generate (base_uuid); + blank_nodes = new HashTable<string,string>.full (str_hash, str_equal, g_free, g_free); ++ if (update_blank_nodes != null) ++ update_blank_nodes.open (new GLib.VariantType("a{ss}")); ++ + solution.solution_index = i; + + set_location (insert_location); + parse_construct_triples_block (solution, + insert_is_update ? + UpdateType.UPDATE : +- UpdateType.INSERT); ++ UpdateType.INSERT, ++ update_blank_nodes); + + if (blank && update_blank_nodes != null) { +- update_blank_nodes.add_value (blank_nodes); ++ update_blank_nodes.close (); + } + + data_update.update_buffer_might_flush (); +@@ -870,7 +877,7 @@ public class Tracker.Sparql.Query : Object { + } + } + +- private void parse_construct_triples_block (Solution var_value_map, UpdateType type) throws Sparql.Error, DateError { ++ private void parse_construct_triples_block (Solution var_value_map, UpdateType type, GLib.VariantBuilder? builder) throws Sparql.Error, DateError { + expect (SparqlTokenType.OPEN_BRACE); + + while (current () != SparqlTokenType.CLOSE_BRACE) { +@@ -878,7 +885,7 @@ public class Tracker.Sparql.Query : Object { + + if (accept (SparqlTokenType.GRAPH)) { + var old_graph = current_graph; +- current_graph = parse_construct_var_or_term (var_value_map, type, out is_null); ++ current_graph = parse_construct_var_or_term (var_value_map, type, out is_null, builder); + + if (is_null) { + throw get_error ("'null' not supported for graph"); +@@ -887,7 +894,7 @@ public class Tracker.Sparql.Query : Object { + expect (SparqlTokenType.OPEN_BRACE); + + while (current () != SparqlTokenType.CLOSE_BRACE) { +- current_subject = parse_construct_var_or_term (var_value_map, type, out is_null); ++ current_subject = parse_construct_var_or_term (var_value_map, type, out is_null, builder); + + if (is_null) { + throw get_error ("'null' not supported for subject"); +@@ -906,7 +913,7 @@ public class Tracker.Sparql.Query : Object { + + optional (SparqlTokenType.DOT); + } else { +- current_subject = parse_construct_var_or_term (var_value_map, type, out is_null); ++ current_subject = parse_construct_var_or_term (var_value_map, type, out is_null, builder); + + if (is_null) { + throw get_error ("'null' not supported for subject"); +@@ -925,7 +932,7 @@ public class Tracker.Sparql.Query : Object { + + bool anon_blank_node_open = false; + +- private string? parse_construct_var_or_term (Solution var_value_map, UpdateType type, out bool is_null) throws Sparql.Error, DateError { ++ private string? parse_construct_var_or_term (Solution var_value_map, UpdateType type, out bool is_null, GLib.VariantBuilder? builder) throws Sparql.Error, DateError { + string result = ""; + is_null = false; + if (current () == SparqlTokenType.VAR) { +@@ -947,7 +954,7 @@ public class Tracker.Sparql.Query : Object { + } else if (accept (SparqlTokenType.BLANK_NODE)) { + // _:foo + expect (SparqlTokenType.COLON); +- result = generate_bnodeid (get_last_string ().substring (1)); ++ result = generate_bnodeid (get_last_string ().substring (1), builder); + } else if (current () == SparqlTokenType.MINUS) { + next (); + if (current () == SparqlTokenType.INTEGER || +@@ -994,7 +1001,7 @@ public class Tracker.Sparql.Query : Object { + anon_blank_node_open = true; + next (); + +- result = generate_bnodeid (null); ++ result = generate_bnodeid (null, builder); + + string old_subject = current_subject; + bool old_subject_is_var = current_subject_is_var; +@@ -1061,7 +1068,7 @@ public class Tracker.Sparql.Query : Object { + + private void parse_construct_object (Solution var_value_map, UpdateType type) throws Sparql.Error, DateError { + bool is_null = false; +- string object = parse_construct_var_or_term (var_value_map, type, out is_null); ++ string object = parse_construct_var_or_term (var_value_map, type, out is_null, null); + var data = manager.get_data (); + if (current_subject == null || current_predicate == null || object == null) { + // the SPARQL specification says that triples containing unbound variables +-- +2.17.0 + diff --git a/app-misc/tracker/files/2.1.7-prevent-stack-smashing.patch b/app-misc/tracker/files/2.1.7-prevent-stack-smashing.patch new file mode 100644 index 000000000000..1f25f115d419 --- /dev/null +++ b/app-misc/tracker/files/2.1.7-prevent-stack-smashing.patch @@ -0,0 +1,39 @@ +From 4238b0a27a3621f4181d38821a4eaee9f0ac1244 Mon Sep 17 00:00:00 2001 +From: Andrea Azzarone <andrea.azzarone@canonical.com> +Date: Fri, 18 Jan 2019 16:14:57 +0000 +Subject: [PATCH 3/5] tracker-monitor: Prevent stack smashing + +Make sure to use GPOINTER_TO_UINT when using g_hash_table_lookup_extended() to +prevent stack smashing. This will make sure that in the architectures where +sizeof(GFileMonitorEvent) < sizeof(gpointer), g_hash_table_lookup_extended() +will not write more bytes than prev_event_type can hold. + +Bug-Upstream: https://gitlab.gnome.org/GNOME/tracker/issues/71 +Origin: upstream, commit:63c0a5d4413e53cb76089fda6f56b2d623c5de15 +Applied-Upstream: 2.2.0 +--- + src/libtracker-miner/tracker-monitor.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c +index 54cd3e8fb..f2431b646 100644 +--- a/src/libtracker-miner/tracker-monitor.c ++++ b/src/libtracker-miner/tracker-monitor.c +@@ -611,10 +611,12 @@ flush_cached_event (TrackerMonitor *monitor, + GFile *file, + gboolean is_directory) + { +- GFileMonitorEvent prev_event_type; ++ gpointer value = NULL; + + if (g_hash_table_lookup_extended (monitor->priv->cached_events, +- file, NULL, (gpointer*) &prev_event_type)) { ++ file, NULL, &value)) { ++ GFileMonitorEvent prev_event_type = GPOINTER_TO_UINT (value); ++ + g_hash_table_remove (monitor->priv->cached_events, file); + emit_signal_for_event (monitor, prev_event_type, + is_directory, file, NULL); +-- +2.17.0 + diff --git a/app-misc/tracker/files/2.1.7-test-fix.patch b/app-misc/tracker/files/2.1.7-test-fix.patch new file mode 100644 index 000000000000..b3dedaa9e6ec --- /dev/null +++ b/app-misc/tracker/files/2.1.7-test-fix.patch @@ -0,0 +1,49 @@ +From 77059dd4b98f422c1e474b9ee53cc05dde875cce Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Wed, 13 Feb 2019 20:09:45 +0200 +Subject: [PATCH 2/5] libtracker-common: improve test_path_evaluate_name + environment handling + +Under some environments $PWD might not point where we expect, so simply +use g_get_current_dir() instead. +g_getenv() is documented to return a pointer that may get overwritten +by subsequent calls to g_getenv, g_setenv of g_unsetenv. As even after +removing the second g_getenv, there's still g_setenv calls, take a copy. +--- + tests/libtracker-common/tracker-file-utils-test.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/tests/libtracker-common/tracker-file-utils-test.c b/tests/libtracker-common/tracker-file-utils-test.c +index d1ddf3004..71a82a5c8 100644 +--- a/tests/libtracker-common/tracker-file-utils-test.c ++++ b/tests/libtracker-common/tracker-file-utils-test.c +@@ -131,14 +131,14 @@ test_path_list_filter_duplicates_with_exceptions () + static void + test_path_evaluate_name (void) + { +- gchar *result, *expected; ++ gchar *result, *expected, *pwd, *home; + +- const gchar *home = g_getenv ("HOME"); +- const gchar *pwd = g_getenv ("PWD"); + + const gchar *test = "/one/two"; + gchar *parent_dir; + ++ home = g_strdup (g_getenv ("HOME")); ++ pwd = g_get_current_dir (); + g_setenv ("TEST_TRACKER_DIR", test, TRUE); + + +@@ -216,6 +216,8 @@ test_path_evaluate_name (void) + result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ()); + g_assert_cmpstr (result, ==, tracker_test_helpers_get_nonutf8 ()); + ++ g_free (home); ++ g_free (pwd); + g_unsetenv ("TEST_TRACKER_DIR"); + } + +-- +2.17.0 + diff --git a/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch b/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch new file mode 100644 index 000000000000..a1fa32738d88 --- /dev/null +++ b/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch @@ -0,0 +1,33 @@ +From d7e31d6940efdb6716689136774a94cfdfd83189 Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho <carlosg@gnome.org> +Date: Mon, 17 Dec 2018 13:34:23 +0100 +Subject: [PATCH] libtracker-data: Update FTS if base tables were altered + +That will issue an update of all tables, so the FTS view might be +affected. This is not caught by ontology change tests, as this +is a situation that can only happen when migrating from 1.x databases +ATM. + +(cherry picked from commit 70758fc059e91936e88d5264b195ac291e995144) +--- + src/libtracker-data/tracker-data-manager.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c +index f2addd0df..05a96b4dd 100644 +--- a/src/libtracker-data/tracker-data-manager.c ++++ b/src/libtracker-data/tracker-data-manager.c +@@ -3701,8 +3701,8 @@ tracker_data_ontology_import_into_db (TrackerDataManager *manager, + } + + #if HAVE_TRACKER_FTS +- if (in_update) { +- update_fts = tracker_data_manager_fts_changed (manager); ++ if (base_tables_altered || in_update) { ++ update_fts = base_tables_altered | tracker_data_manager_fts_changed (manager); + + if (update_fts) + tracker_db_interface_sqlite_fts_delete_table (iface); +-- +2.17.0 + diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml index 64efbfdb6eb6..7516a51a113d 100644 --- a/app-misc/tracker/metadata.xml +++ b/app-misc/tracker/metadata.xml @@ -16,10 +16,8 @@ for ODT.</flag> <flag name="iptc">Enable extraction of IPTC data from pictures</flag> <flag name="iso">Enable extraction of metadata from ISO disk images</flag> + <flag name="miners">Install the <pkg>app-misc/tracker-miners</pkg> package for actual data mining support for tracker</flag> <flag name="miner-fs">Enable tracker-miner-fs (required for filesystem indexing)</flag> - <flag name="nautilus">Enable tracker to integrate with - <pkg>gnome-base/nautilus</pkg> by providing entries in its context menu - </flag> <flag name="playlist">Add support for playlists</flag> <flag name="stemmer">Add word stemming via <pkg>dev-libs/snowball-stemmer</pkg>.</flag> <flag name="thunderbird">Install email data miner plugin for diff --git a/app-misc/tracker/tracker-1.12.4.ebuild b/app-misc/tracker/tracker-1.12.4-r1.ebuild index 509c22fab243..1e40f5389097 100644 --- a/app-misc/tracker/tracker-1.12.4.ebuild +++ b/app-misc/tracker/tracker-1.12.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,9 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0/100" -IUSE="cue elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer -gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager pdf playlist -rss seccomp stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps" +IUSE="cue elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 networkmanager pdf playlist rss seccomp stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps" KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" @@ -90,6 +88,7 @@ DEPEND="${RDEPEND} ${PYTHON_DEPS} $(vala_depend) dev-util/gdbus-codegen + dev-util/glib-utils >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 @@ -98,7 +97,6 @@ DEPEND="${RDEPEND} >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) " -PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )" function inotify_enabled() { if linux_config_exists; then @@ -150,7 +148,6 @@ src_configure() { # unicode-support: libunistring, libicu or glib ? # According to NEWS, introspection is required # is not being generated - # nautilus extension is in a separate package, nautilus-tracker-tags # miner-evolution disabled as it's incompatible with current eds gnome2_src_configure \ --disable-hal \ diff --git a/app-misc/tracker/tracker-2.1.7-r1.ebuild b/app-misc/tracker/tracker-2.1.7-r1.ebuild new file mode 100644 index 000000000000..c9232427a4bc --- /dev/null +++ b/app-misc/tracker/tracker-2.1.7-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6,7} ) + +inherit bash-completion-r1 eapi7-ver gnome.org linux-info meson python-any-r1 systemd vala xdg + +DESCRIPTION="A tagging metadata database, search tool and indexer" +HOMEPAGE="https://wiki.gnome.org/Projects/Tracker" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0/2.0" +IUSE="gtk-doc +miners networkmanager stemmer" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +PV_SERIES=$(ver_cut 1-2) + +# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time +RDEPEND=" + >=dev-libs/glib-2.46:2 + >=sys-apps/dbus-1.3.2 + >=dev-libs/gobject-introspection-1.54:= + >=dev-libs/icu-4.8.1.2:= + >=dev-libs/json-glib-1.0 + >=net-libs/libsoup-2.40.1:2.4 + >=dev-libs/libxml2-2.7 + >=dev-db/sqlite-3.20.0 + networkmanager? ( >=net-misc/networkmanager-0.8 ) + stemmer? ( dev-libs/snowball-stemmer ) + sys-apps/util-linux +" +DEPEND="${RDEPEND} + dev-util/glib-utils + >=dev-util/intltool-0.40.0 + $(vala_depend) + gtk-doc? ( >=dev-util/gtk-doc-1.8 + app-text/docbook-xml-dtd:4.1.2 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + ${PYTHON_DEPS} +" # g-ir-merge needs py3; functional tests need py2, so disabled for now due to mixup +# intltool-merge manually called in meson.build in 2.1.7; properly gone by 2.2.0 +RDEPEND="${RDEPEND} + miners? ( >=app-misc/tracker-miners-${PV_SERIES} ) +" + +PATCHES=( + "${FILESDIR}"/${PV}-doc-options.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/58 + "${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/59 + "${FILESDIR}"/${PV}-prevent-stack-smashing.patch + "${FILESDIR}"/${PV}-glib-2.60-compat.patch + "${FILESDIR}"/${PV}-fix-library-symlinks.patch + "${FILESDIR}"/${PV}-upgrade-path-fix.patch +) + +function inotify_enabled() { + if linux_config_exists; then + if ! linux_chkconfig_present INOTIFY_USER; then + ewarn "You should enable the INOTIFY support in your kernel." + ewarn "Check the 'Inotify support for userland' under the 'File systems'" + ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config" + die 'missing CONFIG_INOTIFY' + fi + else + einfo "Could not check for INOTIFY support in your kernel." + fi +} + +pkg_setup() { + linux-info_pkg_setup + inotify_enabled + + python-any-r1_pkg_setup +} + +src_prepare() { + xdg_src_prepare + vala_src_prepare +} + +src_configure() { + local emesonargs=( + -Dfts=true + -Dfunctional_tests=false # python2, but g-ir-merge needs py3; https://gitlab.gnome.org/GNOME/tracker/merge_requests/40 + $(meson_use gtk-doc) + -Dman=true + -Dnetwork_manager=$(usex networkmanager yes no) + -Dstemmer=$(usex stemmer yes no) + -Dunicode_support=icu + -Dbash_completion="$(get_bashcompdir)" + -Dsystemd_user_services="$(systemd_get_userunitdir)" + ) + meson_src_configure +} + +src_test() { + dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' +} diff --git a/app-misc/worker/Manifest b/app-misc/worker/Manifest index 1b5279aa3bdf..e3ce02a8635a 100644 --- a/app-misc/worker/Manifest +++ b/app-misc/worker/Manifest @@ -1,5 +1,3 @@ -DIST worker-2.19.6.tar.bz2 1191546 BLAKE2B ab806ef55e39f6e0909a25b01abd9c79afe61681ec8b8437fdedd8e663102de298c62141a39a8f0411e40c3ef92635e1593882fd7b93ec6df133d1bccd358f05 SHA512 401c986ff532c225cbd183afd8424e900ed8ff874368d68cb985136d130b5a4d4746a59e391ba01ae610eacd4fec0d76061ba967112b8262e4a9297599596b60 DIST worker-3.8.3.tar.bz2 1519483 BLAKE2B 45573bed62256eda879a776f8a65af63a5c57f8c89784445faf264d2e09403faecdeb225d99ee50498df4c21a9cdf69a131c7d391a24eafe48c2319808b009dd SHA512 fa5d078233a91ec603cd87718542cdd5d99ef89c5d2e72c84fe40c08778c5e9dde8e99a23ccfee5ef61e63535c809a48ccf71fe9a256fd7afa05f848c5045738 -EBUILD worker-2.19.6.ebuild 1330 BLAKE2B e88996e3a9b9c57ceed6ab4abab1d8e407bbcb16719bf03f3ffcb64465b9f4814b01c6c5b1b817dcaf30382dbeeb3a20db456ba2a7a477d6af81b18606016278 SHA512 4180da05eebb296b791d326ad7bdb25d693e7eadda33e077f740dccf0a0d88fc71912b2f619a76d729e016a663259b042ce1a8a6e570b30cd6a63253b651858f -EBUILD worker-3.8.3.ebuild 1265 BLAKE2B a7edef4905b9ea59723d6fd4df43b6ee32e075860305eb7352da393f96e90b693ac3b3f79f23b5fda90f82778365d7359beeeb49248d2709cff4f8c95432a699 SHA512 224a905768919f501046674f6acd7dd9c6d8653edf36bfbbed5efd1445df4b8c2828451a57dfa1f2d264da3ba7f230376ff6179f6d6cf8c1a4d8e82d09ef64d7 +EBUILD worker-3.8.3.ebuild 1264 BLAKE2B 94d3fe57c632417e7b2a913e3fc0556ebac23c8eff0738985d3f5e3283e75839fb77a700a557731c948299035b0d67511cacf1ebf107fd64212615271dd59307 SHA512 9d41c3ddf13e86873ac6288601e0f50e552e912a0cab69133300285947bc0f3a48574d9121729ef721ebd41b03998b0dbb0aa82f23ceec123455ba299d46d2e4 MISC metadata.xml 636 BLAKE2B 9de5b71c8c1536a59308e33590c08227ef0bf31d96c6581fa87126576026bbd2646d1da648da45cfc35bace216a7a3a74c839340eb9f8b8a579b747feaead0b4 SHA512 67911dd438f9fa6ccd9e1f1bf47feb23016564b7d3cd33f846c17e82d83f70c39e6472bb61585a143475f207c3160c575e33fcd5edc5d2fe517ac5cf9f56c682 diff --git a/app-misc/worker/worker-2.19.6.ebuild b/app-misc/worker/worker-2.19.6.ebuild deleted file mode 100644 index 349dd3d81505..000000000000 --- a/app-misc/worker/worker-2.19.6.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="Worker Filemanager: Amiga Directory Opus 4 clone" -HOMEPAGE="http://www.boomerangsworld.de/cms/worker/" -SRC_URI="http://www.boomerangsworld.de/cms/worker/downloads/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86" -IUSE="avfs debug dbus examples libnotify +magic xinerama xft" - -RDEPEND="x11-libs/libSM - x11-libs/libX11 - avfs? ( >=sys-fs/avfs-0.9.5 ) - dbus? ( dev-libs/dbus-glib ) - magic? ( sys-apps/file ) - xft? ( x11-libs/libXft ) - xinerama? ( x11-libs/libXinerama )" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS ChangeLog INSTALL NEWS README README_LARGEFILES THANKS ) - -src_prepare() { - # respect AR, bug #466014 - sed -i -e "/AR/s/ar/$(tc-getAR)/" src/aguix/Makefile.in || die 'sed on Makefile.in failed' - - epatch_user -} - -src_configure() { - # there is no option for disabling libXinerama support - use xinerama || export ac_cv_lib_Xinerama_XineramaQueryScreens=no - econf \ - --without-hal \ - $(use_with avfs) \ - $(use_with dbus) \ - $(use_enable debug) \ - $(use_enable libnotify inotify) \ - $(use_with magic libmagic) \ - $(use_enable xft) -} - -src_install() { - default - if use examples; then - docinto examples - dodoc examples/config-* - fi -} diff --git a/app-misc/worker/worker-3.8.3.ebuild b/app-misc/worker/worker-3.8.3.ebuild index b4c4e60edc8e..a7d14a742e75 100644 --- a/app-misc/worker/worker-3.8.3.ebuild +++ b/app-misc/worker/worker-3.8.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.boomerangsworld.de/cms/worker/downloads/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86" IUSE="avfs debug dbus examples libnotify lua +magic xinerama xft" RDEPEND="x11-libs/libX11 |