From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- sys-fs/mhddfs/Manifest | 4 ++-- sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch | 17 ----------------- sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch | 7 ++++--- 3 files changed, 6 insertions(+), 22 deletions(-) (limited to 'sys-fs/mhddfs') diff --git a/sys-fs/mhddfs/Manifest b/sys-fs/mhddfs/Manifest index b5710beb1180..4da3db5b6a22 100644 --- a/sys-fs/mhddfs/Manifest +++ b/sys-fs/mhddfs/Manifest @@ -1,6 +1,6 @@ -AUX mhddfs-0.1.39-segfault-fix.patch 4711 BLAKE2B fc75c9e1fa8f3844feeb9d301a48aef977feeee14aadf8763c0abf9817b1a37e80c4421a9cd1b5be8f4ac9b3ed24c8cf563d1fd6d08cd70552b89ded7fb1b9d4 SHA512 4a2242c1d6344d651288c5f6c1c714d98d707b5d6b9c839f5100fd4b3476b74d681fb6502b6559959665470dfc7b00954a0781eedc461a96e972c8df1632a1fd +AUX mhddfs-0.1.39-segfault-fix.patch 4237 BLAKE2B e97dcb4ee22cdf4a35aa74dd20daadfaa2428686950755131e4e7e09eccd3f5250f0d5c3da6232dfaf4c40a32f9b6f41d2005b3cafbe2456a74a06a0a7584ca4 SHA512 9fc611ba5771b04b8573db8b25556e15b2e37a1310c533f2b7a56323e887477c57820f62088100bed2784c14a6ffee3a0dfc2b8f88fa3c234d2a82f670eb07d2 AUX mhddfs-0.1.39-xattr.patch 498 BLAKE2B e0a1a72c2883135956f885e974473fb3df10f4e1eb5e4781badde84d1545f4e2943583a62f3f93c68036aab83510d78970ead98ad45f24da1ac95620da4863c0 SHA512 5d2ffffea05499fbcacbae1d7b9062dd4bdbe7d0ee30b2e5ca30fcfc3e5a3de81a7664b09fe847b34f7e8016c7038b40a49a6f008fc8ea5bb377a0581c3d6bb7 -AUX mhddfs-respect-compiler-vars.patch 1556 BLAKE2B f032b6de368aa8c51ea743aa00a2561bc2bd29a652a4c6b34a2ce072345f2ada14995599ee5185a6ff5d06a0ca5dae2da33aa17199e2d6307ef3ff1ac8feb147 SHA512 91035e5474f333545236330ce46ee80e2c3cfed679d68588e22e9db64cb6d4af5c0019ea32972cc347e4b9f73300334f97828fae4b13c2e4de0e2b5f734246e5 +AUX mhddfs-respect-compiler-vars.patch 1614 BLAKE2B 281bf8643662f1b36cd33e4aa16de3d40a647e8feff7cca221a603f6dd726faa3098eb93097152735ef6389a4bf47d2e4fa6b6a824774641cb2e9e582e430bba SHA512 3c20a81010acc24c7ca1413adba5544c7d77c562861d9b33cb8423b4218f1a019d119996b62830add002e20fd9a618814b7338ca54a912ac35cb2cabd977c9e7 DIST mhddfs_0.1.39.tar.gz 40665 BLAKE2B 5f7fa51d606985085fdb6346af5fdc6526d6f236b93a4deaad8143ac870cc3e85b5a6d9c94150567e2b34fd8ab0edaf4e0dfbf9c1cfc503f29386998bf84ed2d SHA512 cf1952e665e82a92ccfef9215d4faf78cd235566b67e6ebc3a60ab53089d9391bc41a08e6b203ad052e4a08bdd14428f2d9abe48f341aeb0c80ae1da80f83f89 EBUILD mhddfs-0.1.39-r2.ebuild 1090 BLAKE2B e5e58d3e5ff317297ad83a765dbaa93ec137f21588f04615bb90d86ed9238fc154f5d853a31b6c8ae494653b9eeba80130a0109c172e90a983c3b92b7fd600f6 SHA512 e49f2d9dade5f202e3b9dc5a832811bb0e2be09ea8778da779a2773fb59fd7c310394696f8e6da55ceec5a9285d9d3177452052fd49f6858ecccee79f7d92d7b MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a diff --git a/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch b/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch index 493a78396190..74132c158dc0 100644 --- a/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch +++ b/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch @@ -178,23 +178,6 @@ Thanks to Gabor Kovari " mhddfs dir1,dir2.. mountpoint [ -o OPTIONS ]\n" --- a/Makefile 2016-01-05 16:45:10.184105001 +0100 +++ b/Makefile 2015-12-21 16:32:29.000000000 +0100 -@@ -22,13 +22,13 @@ - - TARGET = mhddfs - --CFLAGS += -Wall $(shell pkg-config fuse --cflags) \ -- -DFUSE_USE_VERSION=26 -MMD -+CFLAGS = -Wall $(shell pkg-config fuse glib-2.0 --cflags) \ -+ -DFUSE_USE_VERSION=26 -MMD -g -rdynamic -O0 - ifdef WITHOUT_XATTR - CFLAGS += -DWITHOUT_XATTR - endif - --LIBS = $(shell pkg-config fuse --libs) -+LDFLAGS = $(shell pkg-config fuse glib-2.0 --libs) - - FORTAR = src COPYING LICENSE README Makefile \ - README.ru.UTF-8 ChangeLog mhddfs.1 \ @@ -53,7 +53,7 @@ ifeq ($(DEBVERSION), $(VERSION)) all: $(TARGET) diff --git a/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch b/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch index 0c6f24f4d1a7..278c9876da73 100644 --- a/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch +++ b/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch @@ -5,14 +5,15 @@ TARGET = mhddfs -CFLAGS = -Wall $(shell pkg-config fuse --cflags) \ -+CFLAGS += -Wall $(shell pkg-config fuse --cflags) \ - -DFUSE_USE_VERSION=26 -MMD +- -DFUSE_USE_VERSION=26 -MMD ++CFLAGS += -Wall $(shell pkg-config fuse glib-2.0 --cflags) \ ++ -DFUSE_USE_VERSION=26 -MMD -rdynamic ifdef WITHOUT_XATTR CFLAGS += -DWITHOUT_XATTR endif -LDFLAGS = $(shell pkg-config fuse --libs) -+LIBS = $(shell pkg-config fuse --libs) ++LIBS = $(shell pkg-config fuse glib-2.0 --libs) FORTAR = src COPYING LICENSE README Makefile \ README.ru.UTF-8 ChangeLog mhddfs.1 \ -- cgit v1.2.3