commit: eb742ea1fc61d7135e9979980635938bb0c8b79d Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> AuthorDate: Wed Jan 28 00:21:53 2015 +0000 Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> CommitDate: Wed Jan 28 00:21:53 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/bircoph.git;a=commit;h=eb742ea1
Fix GIO only build. Update version. --- app-admin/clsync/ChangeLog | 4 ++++ app-admin/clsync/Manifest | 6 +++-- app-admin/clsync/clsync-0.4.ebuild | 4 +++- app-admin/clsync/files/clsync-0.4-gio.patch | 32 +++++++++++++++++++++++++ app-admin/clsync/files/clsync-0.4-version.patch | 19 +++++++++++++++ 5 files changed, 62 insertions(+), 3 deletions(-) diff --git a/app-admin/clsync/ChangeLog b/app-admin/clsync/ChangeLog index fff2084..497f6d6 100644 --- a/app-admin/clsync/ChangeLog +++ b/app-admin/clsync/ChangeLog @@ -3,6 +3,10 @@ # $Header: $ 28 Jan 2015; Andrew Savchenko <[email protected]> clsync-0.4.ebuild, + +files/clsync-0.4-gio.patch, +files/clsync-0.4-version.patch: + Fix GIO only build. Update version. + + 28 Jan 2015; Andrew Savchenko <[email protected]> clsync-0.4.ebuild, clsync-9999.ebuild: Require at least one FS handler to be enabled. diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest index 2925ddb..297cd2b 100644 --- a/app-admin/clsync/Manifest +++ b/app-admin/clsync/Manifest @@ -1,5 +1,7 @@ +AUX clsync-0.4-gio.patch 1254 SHA256 2bc5cc03cd456ed09879e77e963e17bedb05d3deaff77f4d18bdc67c521773f1 SHA512 888f0941dcfd8843007afee889c005c613d731750882b0acbadceb08b514f177b9b75f992827050a40247002c8d29d7fcf4e75eabafe6eb54fc1d05e30893ffd WHIRLPOOL 5df5185fd97bb4d77297e40e1722b4ddfbb27c444c6a506939ee9a3075be0200aeca3c0f08f62e9650a04583cd55f1d05c106a77b7f2eb2e9af3621f9597d4f2 AUX clsync-0.4-unshare-configure.patch 1198 SHA256 c60e2f8e33e1ca04d27e8887982d83eb5efb8a3f3f6871f97feba931aaa0db74 SHA512 c0be6a085a33e3c09bfe52fc5aff3a1136fbbdde7cf928bd1ff21c7e435ae8562a626ed7d561c83e74580f17e2ad1c61be778d0a7f01b2ad0890a9d5cc1e54cd WHIRLPOOL 826d597da90d8f71b3ff902c5c55bbd3ae82bae33157f99469bfe8dec4ad93f16a1f2d10c0b78f561c58f6d01832ed2bbc2267ab619e21bd19c939034ae8b401 AUX clsync-0.4-unshare-ifdef.patch 989 SHA256 2fc98fa742ed24068af39c950eb7fa33a048a2cbb3aab44b074928cd86c5cefb SHA512 2a6e98a2ea8d1dd663fdaf6eed0d6706c61b646c4178ca8be5598d1d6a3dd8023b92f02858f7324c5ceab601ed5c8ec1ee6bcc7210664cd57dc281a116bbde3c WHIRLPOOL 9535ac8e746e4ce980d4f17c05f554e55f5ab717d79e20ba09751f176383e46c2b52777cccce10f28422b4d459f0ef8c8a5f900c4857994a8bab5c6108bd5e27 +AUX clsync-0.4-version.patch 694 SHA256 8b899b74f59dc6acb134ab4b2254e222c8d148ed827054c1e263625a73405c9d SHA512 9a08ecf5c062827d8e02b4822a879115d394d36d6c81bc138dee4b65519c6a2e333445e953965057d8b32ad3bca6ced8a699f59d798d31bb022c4b9129d8b681 WHIRLPOOL fd214257b4a2fd24120a4620df55edd78010f5db507493b3e0c1bd06f91e97e2b3caffdbabad4c4b0d1cc7c3f02d9d290805c4d6e10edf5e44d081ae1b837e1b AUX clsync.conf 586 SHA256 da5b5611d9253094828ef4ff66d72cd36e807f36c218807d8da6386f45a56dab SHA512 ecaacdd5869a3c9552dd4a1441ed313e0e2f977c82b0a19ea1300f069e45ba6b49bcc9f6b35ab3031727fe7a09af0c647b9b34248d14f3e30701746170874e6d WHIRLPOOL e6b2ea8d0267051049152fa8e2dedcec89bc7be6cab48a9a91a39810de12094b1499a622cb0b8b6c3c0880a2e82713fed834bdf4337241f46c9673d1b2fc71eb AUX clsync.conf-2 589 SHA256 1a8689b86cf9475ef72ef42a623a1bb1ae55abff31578dcfdf3537331c681815 SHA512 46d8d786378eed0bfa46195e45f764015258ba55b35a5acf2685967e9fbd1fc7656c6aeba26b06889fa2f7c62cb11ecb84b10b856356ea3c0d463eaa4980c33d WHIRLPOOL cd9a0800b75eab476d7feec079f23538295dca5067f979ce4280c3188b9a24adf7c78e0c2ec5e2e8cadd71d11be181d873bc462d9fe321ada85e4e11690272db AUX clsync.confd 645 SHA256 ae7e9cacf618f9a32a4a1580580a901831aaaa0abb9de9e0379fbcc6a7359b0d SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5 WHIRLPOOL 06289c7645430d10b242983daa9cd2d4c2f327b34ede308012354947c64c654a7864586743ae6de7c02770a8b1c22de04b63404a6431b317b328ac6ac1e121ce @@ -10,7 +12,7 @@ DIST clsync-0.3.tar.gz 122664 SHA256 054f7032993f51a35cf3fdc91aeb3ad358f63432f8d DIST clsync-0.4.tar.gz 253396 SHA256 6f0ce7a5f61fbb50db53b787b62cf5347870f3be315acb02c4aee6b76206d19e SHA512 9b17f5f8f0bfc48531f3d8cb4f1c1edd3116e0b7d140e8ab2465dd1c590521c9857202ed3f36466f13fb3309abb9232fb4acbe25b5652914a816fac498f74a48 WHIRLPOOL 18ae12df2d7e0403b21c5d4ab7352cd81446729d94fb300a799b98dad9f88aeaa98deb2ba5f52858d3b6ba7406d777e53e97dae5c3a4802a229511db9c8a3482 EBUILD clsync-0.2.1.ebuild 2148 SHA256 9069d6bbba621a368ce6f1fd1602d984aa0c37a5297df7ff43598b53603ca726 SHA512 9ab6e36e094c43f7e506c743a0159ab00e09a216676b0693a8f2f3a0df8160c5c706122bb9e36e754c0e50a6dc63856dae86743e6e3a22be80b2bbf7ef21523f WHIRLPOOL 27b60f03a084a821dda72799540605266557fae9b5379bfaa5c0601c42894d84d1ddd68d9dd6f2f8cf72f3cf7dc38cfc7e75821416290b2c8bf8c74af50b8543 EBUILD clsync-0.3.ebuild 2219 SHA256 71f1c52b62d0379c1bf03ce4a49fe2cc612697008aabbf58d3b7b882952c35ec SHA512 2cb4ce6f305a1ebb020157915324f824cf554ccd95761ebe13b4099f8418676173b9953994095c29c16b11942d7fb6a3029cdb5b94c572803ca0af183d16c659 WHIRLPOOL 37766e003335286b13a4dad913d838f3cb4b75d3b216b5b3265d93a36353f15e365c93d0768341d6bbaaf4fbb785ff2774f554fd57d009fc396ae2fb6aaacac3 -EBUILD clsync-0.4.ebuild 3018 SHA256 540259169ffb859994ab3367068429f19216491394394fccb7b30c4a2009db24 SHA512 51259ff6af1810af41c7a015efceb02b54c65b4c3d0d3df97ca6f500b1d9e7d159de269080c48bde893ea3fb8ed76d2318f957008e891e98654823c1a377a027 WHIRLPOOL 69068811e30fab990580fc8adbce7ea0ae856392fd43680b246ec0d2958c94085b9ea414bab1ed120bb54b5aff411b567c445f110f8862309a38ec64734c3dcf +EBUILD clsync-0.4.ebuild 3088 SHA256 47184f168374162627b6096721b3d6e053aaf9839e1e81fc99352a71f9602bee SHA512 b5916a568d70699cfa9772a8bf01f86a34e8d88b476bd29db47993cda09130b7006b6a94a165ae209572ec8e445b5fc4d8401b305435a704423f2525064c5c16 WHIRLPOOL 52c5a7c8e318a163d02673f0a648cb0c5480deb0aea07ba718371dfe7e5cd44503d75d067e826621719b611a1d56a3f9d072031fd03bed5089dc20c050fe4419 EBUILD clsync-9999.ebuild 2913 SHA256 d9b5d48c718c9f4799fb0741724b13fe21c4d4a3256b9886ea6c962d0b682658 SHA512 269d82598e8e446b94f26743395028414203113b1929fa23c2177a957c304e18c61e4ffef965d5fdd5a19d562770494a548bb56cea5c09d289b89078cfd6e371 WHIRLPOOL 762ca80f9cb7603ad5ab567a0610d4de806c59494f5b09e2de3e81ba0a354cfc744ffaaed725782952cf8bff4c0bb6e9d13fecacbe9f5520b4ea005abe6d6ba9 -MISC ChangeLog 3784 SHA256 8e907a3f9ff131e567de399f12977d894ca0ac2991af7bda3f1b60b34786e560 SHA512 223ee44b5625f1f5f3230e6ef3c39c2677c21863793b83235167acc926ee050e2a0bff7cd3f27fe37989f7255945ae922422f6fd09e036884a982e4a90f3588d WHIRLPOOL 5c4fe4ea9950006bcb211724ecf07516147d8ff273baf188ccd57b94b79c822cd39a7bb0796ab3a5e93c708d913c74a3e6e851ad8ec3ee098d5cceda578fa1da +MISC ChangeLog 3959 SHA256 22680c9ff247156e63bca18dc27468e53aa69176238f685857c5390c5ba11251 SHA512 de46b4a06c71bed045266be5c65c547a2b2a2155314aa5c3ce460dbc4ac9dc83af4c29d5bcf3b4788fa49ec32f7fe67f058975a791b29058bc3f70060596d538 WHIRLPOOL 26f9c1609d3b6dedd3307734029be117633d088848861b650f7b854e7b0faf739cf7d00aa623ca6271fe5215b1f16efffe9ca1a517cc245b63550e24cd5b177e MISC metadata.xml 1668 SHA256 b11ec92e63438d8968523e38977cfca79c2598fd5b78a663fe647393f322c5b8 SHA512 9d24c1fbb0eb18971aea4bead3ee6d28b48891699c17bfe238866317f90fbe3974d65af2d3673397f6370c96de7d34d9f3b08e62b99dc0dc285bbf35bdf96bf5 WHIRLPOOL 42087cfebd77371e899b50a370334c589f917f4368d877041d874abc836d52ed70b1d24ea475b08f906df81d65b87c105a170b27e747558fb789795196dd4f77 diff --git a/app-admin/clsync/clsync-0.4.ebuild b/app-admin/clsync/clsync-0.4.ebuild index 56a184c..2709286 100644 --- a/app-admin/clsync/clsync-0.4.ebuild +++ b/app-admin/clsync/clsync-0.4.ebuild @@ -48,8 +48,10 @@ pkg_pretend() { src_prepare() { epatch \ + "${FILESDIR}/${P}-gio.patch" \ "${FILESDIR}/${P}-unshare-configure.patch" \ - "${FILESDIR}/${P}-unshare-ifdef.patch" + "${FILESDIR}/${P}-unshare-ifdef.patch" \ + "${FILESDIR}/${P}-version.patch" eautoreconf } diff --git a/app-admin/clsync/files/clsync-0.4-gio.patch b/app-admin/clsync/files/clsync-0.4-gio.patch new file mode 100644 index 0000000..cdcbbc2 --- /dev/null +++ b/app-admin/clsync/files/clsync-0.4-gio.patch @@ -0,0 +1,32 @@ +commit 4eea85337a3358baae0b4f0626d63a9626778a01 +Author: Andrew Savchenko <[email protected]> +Date: Wed Jan 28 02:50:36 2015 +0300 + + Add GIO to the list of allowed file monitors. + + This allows to compile clsync ONLY with GIO support. + +diff --git a/configure.ac b/configure.ac +index f497c67..a3f0324 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -262,7 +262,7 @@ dnl tre check + # ;; + #esac + +-dnl kqueue/inotify/bsm ++dnl kqueue/inotify/gio/bsm + + AC_ARG_WITH(kqueue, + AS_HELP_STRING(--with-kqueue, +@@ -476,7 +476,9 @@ AM_CONDITIONAL([HAVE_SECCOMP], [test "x$HAVE_SECCOMP" != "x"]) + AM_CONDITIONAL([HAVE_TRE], [test "x$HAVE_TRE" != "x"]) + AM_CONDITIONAL([HAVE_LIBCGROUP], [test "x$HAVE_LIBCGROUP" != "x"]) + +-AS_IF([test "$HAVE_KQUEUE" = '' -a "$HAVE_INOTIFY" = '' -a "$HAVE_FANOTIFY" = '' -a "$HAVE_BSM" = '' ], [AC_MSG_FAILURE([kqueue, inotify and bsm are not supported on this system])]) ++AS_IF([test "$HAVE_KQUEUE" = '' -a "$HAVE_INOTIFY" = '' -a "$HAVE_FANOTIFY" = '' -a "$HAVE_BSM" = '' -a "$HAVE_GIO" = ''], ++[AC_MSG_FAILURE([At least one monitoring engine must be enabled! ++Available (depending on system): inotify, kqueue, gio, bsm])]) + + LIBS="${GLIB_LIBS} ${LIBS}" + AM_CPPFLAGS="${GLIB_CFLAGS}" diff --git a/app-admin/clsync/files/clsync-0.4-version.patch b/app-admin/clsync/files/clsync-0.4-version.patch new file mode 100644 index 0000000..58eea5e --- /dev/null +++ b/app-admin/clsync/files/clsync-0.4-version.patch @@ -0,0 +1,19 @@ +commit e9eeb552896a3ac3f4f1e9d72ecab6a200f3c70c +Author: Andrew Savchenko <[email protected]> +Date: Tue Jan 27 21:54:21 2015 +0300 + + update package string + +diff --git a/configure.ac b/configure.ac +index 45f5a23..3e0b3cc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ + # Process this file with autoconf to produce a configure script. + + AC_PREREQ([2.59]) +-AC_INIT([clsync],[0.3],[Dmitry Yu Okunev <[email protected]>],,[https://github.com/xaionaro/clsync]) ++AC_INIT([clsync],[0.4],[Dmitry Yu Okunev <[email protected]>],,[https://github.com/xaionaro/clsync]) + AC_CONFIG_SRCDIR([sync.c]) + AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([1.11 foreign -Wall -Wno-portability])
