root
7 years ago
parent
2727082f83
commit
d34b9534c4
@ -1,104 +0,0 @@
|
||||
From b1f6a30bcce020b3c377434137de9856a09b899a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Fri, 11 Nov 2011 11:27:43 +0100
|
||||
Subject: [PATCH] Make scroll UTF-8 aware. Fixes bug #3134941.
|
||||
|
||||
---
|
||||
src/scroll.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
|
||||
1 files changed, 42 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/scroll.c b/src/scroll.c
|
||||
index f78f807..738db0d 100644
|
||||
--- a/src/scroll.c
|
||||
+++ b/src/scroll.c
|
||||
@@ -34,12 +34,33 @@
|
||||
|
||||
struct scroll_data {
|
||||
char *text;
|
||||
+ unsigned int show_orig;
|
||||
unsigned int show;
|
||||
unsigned int step;
|
||||
unsigned int start;
|
||||
long resetcolor;
|
||||
};
|
||||
|
||||
+int utf8_charlen(char c) {
|
||||
+ unsigned char uc = (unsigned char) c;
|
||||
+ int len = 0;
|
||||
+
|
||||
+ if ((uc & 0x80) == 0)
|
||||
+ return 1;
|
||||
+
|
||||
+ while ((uc & 0x80) != 0) {
|
||||
+ ++len;
|
||||
+ uc <<= 1;
|
||||
+ }
|
||||
+
|
||||
+ return (len > 0 && len <= 4) ? len : -1;
|
||||
+}
|
||||
+
|
||||
+int is_utf8_char_tail(char c) {
|
||||
+ unsigned char uc = (unsigned char) c;
|
||||
+ return (uc & 0xc0) == 0x80;
|
||||
+}
|
||||
+
|
||||
void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_crash)
|
||||
{
|
||||
struct scroll_data *sd;
|
||||
@@ -60,15 +81,18 @@ void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_cr
|
||||
sd->step = 1;
|
||||
}
|
||||
sd->text = malloc(strlen(arg + n1) + sd->show + 1);
|
||||
+ // sd->show value may change when there are UTF-8 chars to be shown, so
|
||||
+ // save its origin value
|
||||
+ sd->show_orig = sd->show;
|
||||
|
||||
if (strlen(arg) > sd->show) {
|
||||
for(n2 = 0; (unsigned int) n2 < sd->show; n2++) {
|
||||
- sd->text[n2] = ' ';
|
||||
+ sd->text[n2] = ' ';
|
||||
}
|
||||
sd->text[n2] = 0;
|
||||
}
|
||||
else
|
||||
- sd->text[0] = 0;
|
||||
+ sd->text[0] = 0;
|
||||
|
||||
strcat(sd->text, arg + n1);
|
||||
sd->start = 0;
|
||||
@@ -82,9 +106,13 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor
|
||||
{
|
||||
struct scroll_data *sd = obj->data.opaque;
|
||||
unsigned int j, colorchanges = 0, frontcolorchanges = 0, visibcolorchanges = 0, strend;
|
||||
+ int charlen = 0;
|
||||
+ unsigned int utf8lenfix = 0;
|
||||
char *pwithcolors;
|
||||
char buf[max_user_text];
|
||||
|
||||
+ sd->show = sd->show_orig;
|
||||
+
|
||||
if (!sd)
|
||||
return;
|
||||
|
||||
@@ -109,6 +137,18 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor
|
||||
while(*(buf + sd->start) == SPECIAL_CHAR) {
|
||||
sd->start++;
|
||||
}
|
||||
+ //skip parts of UTF-8 character which messes up display
|
||||
+ while(is_utf8_char_tail(*(buf + sd->start))) {
|
||||
+ sd->start++;
|
||||
+ }
|
||||
+ //extend length to be shown for wide characters
|
||||
+ j = 0;
|
||||
+ while(j < sd->show + visibcolorchanges + utf8lenfix) {
|
||||
+ charlen = utf8_charlen(*(buf + sd->start + j));
|
||||
+ utf8lenfix += (charlen > 1 ? charlen - 1 : 0);
|
||||
+ j += charlen;
|
||||
+ }
|
||||
+ sd->show = sd->show_orig + utf8lenfix;
|
||||
//place all chars that should be visible in p, including colorchanges
|
||||
for(j=0; j < sd->show + visibcolorchanges; j++) {
|
||||
p[j] = *(buf + sd->start + j);
|
||||
--
|
||||
1.7.8.rc1
|
||||
|
||||
@ -1,106 +0,0 @@
|
||||
Description: Fix broken apcupsd support in Conky 1.8.1
|
||||
Revert apcupsd-related code to Conky 1.8.0 in order to fix broken apcupsd
|
||||
support. This is a workaround until upstream properly addresses this issue.
|
||||
From: Brian Derr <bderrly@gmail.com>
|
||||
Forwarded: https://sourceforge.net/support/tracker.php?aid=3083859
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/bugs/897495
|
||||
Last-Update: 2011-12-02
|
||||
|
||||
--- a/src/apcupsd.c
|
||||
+++ b/src/apcupsd.c
|
||||
@@ -154,7 +154,7 @@
|
||||
//
|
||||
// Conky update function for apcupsd data
|
||||
//
|
||||
-int update_apcupsd(void) {
|
||||
+void update_apcupsd(void) {
|
||||
|
||||
int i;
|
||||
APCUPSD_S apc;
|
||||
@@ -164,41 +164,44 @@
|
||||
memcpy(apc.items[i], "N/A", 4); // including \0
|
||||
|
||||
do {
|
||||
- struct addrinfo hints;
|
||||
- struct addrinfo *ai, *rp;
|
||||
- int res;
|
||||
+ struct hostent* he = 0;
|
||||
+ struct sockaddr_in addr;
|
||||
short sz = 0;
|
||||
- char portbuf[8];
|
||||
+#ifdef HAVE_GETHOSTBYNAME_R
|
||||
+ struct hostent he_mem;
|
||||
+ int he_errno;
|
||||
+ char hostbuff[2048];
|
||||
+#endif
|
||||
//
|
||||
// connect to apcupsd daemon
|
||||
//
|
||||
- memset(&hints, 0, sizeof(struct addrinfo));
|
||||
- hints.ai_family = AF_UNSPEC;
|
||||
- hints.ai_socktype = SOCK_STREAM;
|
||||
- hints.ai_flags = 0;
|
||||
- hints.ai_protocol = 0;
|
||||
- snprintf(portbuf, 8, "%d", info.apcupsd.port);
|
||||
- res = getaddrinfo(info.apcupsd.host, portbuf, &hints, &ai);
|
||||
- if (res != 0) {
|
||||
- NORM_ERR("APCUPSD getaddrinfo: %s", gai_strerror(res));
|
||||
+ sock = socket(AF_INET, SOCK_STREAM, 0);
|
||||
+ if (sock < 0) {
|
||||
+ perror("socket");
|
||||
break;
|
||||
}
|
||||
- for (rp = ai; rp != NULL; rp = rp->ai_next) {
|
||||
- sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
|
||||
- if (sock == -1) {
|
||||
- continue;
|
||||
- }
|
||||
- if (connect(sock, rp->ai_addr, rp->ai_addrlen) != -1) {
|
||||
- break;
|
||||
- }
|
||||
- close(sock);
|
||||
+#ifdef HAVE_GETHOSTBYNAME_R
|
||||
+ if (gethostbyname_r(info.apcupsd.host, &he_mem, hostbuff, sizeof(hostbuff), &he, &he_errno) || !he ) {
|
||||
+ NORM_ERR("APCUPSD gethostbyname_r: %s", hstrerror(h_errno));
|
||||
+ break;
|
||||
+ }
|
||||
+#else /* HAVE_GETHOSTBYNAME_R */
|
||||
+ he = gethostbyname(info.apcupsd.host);
|
||||
+ if (!he) {
|
||||
+ herror("gethostbyname");
|
||||
+ break;
|
||||
}
|
||||
- freeaddrinfo(ai);
|
||||
- if (rp == NULL) {
|
||||
+#endif /* HAVE_GETHOSTBYNAME_R */
|
||||
+
|
||||
+ memset(&addr, 0, sizeof(addr));
|
||||
+ addr.sin_family = AF_INET;
|
||||
+ addr.sin_port = info.apcupsd.port;
|
||||
+ memcpy(&addr.sin_addr, he->h_addr, he->h_length);
|
||||
+ if (connect(sock, (struct sockaddr*)&addr, sizeof(struct sockaddr)) < 0) {
|
||||
// no error reporting, the daemon is probably not running
|
||||
break;
|
||||
}
|
||||
-
|
||||
+
|
||||
//
|
||||
// send status request - "status" - 6B
|
||||
//
|
||||
@@ -222,5 +225,5 @@
|
||||
// "atomically" copy the data into working set
|
||||
//
|
||||
memcpy(info.apcupsd.items, apc.items, sizeof(info.apcupsd.items));
|
||||
- return 0;
|
||||
+ return;
|
||||
}
|
||||
--- a/src/apcupsd.h
|
||||
+++ b/src/apcupsd.h
|
||||
@@ -49,6 +49,6 @@
|
||||
} APCUPSD_S, *PAPCUPSD_S;
|
||||
|
||||
/* Service routine for the conky main thread */
|
||||
-int update_apcupsd(void);
|
||||
+void update_apcupsd(void);
|
||||
|
||||
#endif /*APCUPSD_H_*/
|
||||
@ -1,18 +0,0 @@
|
||||
diff -r -U 5 conky-1.9.0/src/specials.c conky-1.9.0/src/specials.c
|
||||
--- conky-1.9.0/src/specials.c 2012-05-03 22:13:47.000000000 +0100
|
||||
+++ conky-1.9.0/src/specials.c 2013-02-27 21:16:15.856669451 +0000
|
||||
@@ -186,12 +186,12 @@
|
||||
g->scale = defscale;
|
||||
if (sscanf(args, "%1023s %d,%d %x %x", buf, &g->height, &g->width, &g->first_colour, &g->last_colour) == 5) {
|
||||
return strndup(buf, text_buffer_size);
|
||||
}
|
||||
buf[0] = '\0';
|
||||
- g->height = 25;
|
||||
- g->width = 0;
|
||||
+ g->height = default_graph_height;
|
||||
+ g->width = default_graph_width;
|
||||
if (sscanf(args, "%x %x %u", &g->first_colour, &g->last_colour, &g->scale) == 3) {
|
||||
return NULL;
|
||||
}
|
||||
g->scale = defscale;
|
||||
if (sscanf(args, "%x %x", &g->first_colour, &g->last_colour) == 2) {
|
||||
@ -1,23 +0,0 @@
|
||||
--- a/src/linux.c
|
||||
+++ b/src/linux.c
|
||||
@@ -80,6 +80,10 @@
|
||||
#define NBD_MAJOR 43
|
||||
#endif
|
||||
|
||||
+#if !defined(DM_MAJOR)
|
||||
+#define DM_MAJOR 253
|
||||
+#endif
|
||||
+
|
||||
#ifdef HAVE_IWLIB
|
||||
#include <iwlib.h>
|
||||
#endif
|
||||
@@ -2336,7 +2340,8 @@ int update_diskio(void)
|
||||
*
|
||||
* XXX: ignore devices which are part of a SW RAID (MD_MAJOR) */
|
||||
if (col_count == 5 && major != LVM_BLK_MAJOR && major != NBD_MAJOR
|
||||
- && major != RAMDISK_MAJOR && major != LOOP_MAJOR) {
|
||||
+ && major != RAMDISK_MAJOR && major != LOOP_MAJOR
|
||||
+ && major != DM_MAJOR ) {
|
||||
/* check needed for kernel >= 2.6.31, see sf #2942117 */
|
||||
if (is_disk(devbuf)) {
|
||||
total_reads += reads;
|
||||
@ -1,36 +0,0 @@
|
||||
diff -urN old/src/conky.c new/src/conky.c
|
||||
--- old/src/conky.c 2012-05-03 23:22:21.000000000 +0200
|
||||
+++ new/src/conky.c 2012-08-15 00:06:59.256311301 +0200
|
||||
@@ -3065,12 +3065,26 @@
|
||||
og = g;
|
||||
}
|
||||
|
||||
- /* this is mugfugly, but it works */
|
||||
- XDrawLine(display, window.drawable, window.gc,
|
||||
- cur_x + i + 1,
|
||||
- specials[special_index].dotgraph ? og : by + h,
|
||||
- cur_x + i + 1,
|
||||
- g);
|
||||
+ if (specials[special_index].dotgraph) {
|
||||
+ if (og == g) {
|
||||
+ XDrawPoint(display, window.drawable,
|
||||
+ window.gc, cur_x + i + 1, g);
|
||||
+ } else {
|
||||
+ XDrawLine(display, window.drawable, window.gc,
|
||||
+ cur_x + i + 1,
|
||||
+ og,
|
||||
+ cur_x + i + 1,
|
||||
+ g);
|
||||
+ }
|
||||
+ } else {
|
||||
+ /* this is mugfugly, but it works */
|
||||
+ XDrawLine(display, window.drawable, window.gc,
|
||||
+ cur_x + i + 1,
|
||||
+ by + h,
|
||||
+ cur_x + i + 1,
|
||||
+ g);
|
||||
+ }
|
||||
+
|
||||
++j;
|
||||
}
|
||||
if (tmpcolour) free(tmpcolour);
|
||||
@ -1,31 +0,0 @@
|
||||
From fd9462da5ed12369fc6a72e42ebc45c6707403fb Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Labath <pavelo@centrum.sk>
|
||||
Date: Fri, 13 Jul 2012 13:41:09 +0200
|
||||
Subject: [PATCH] Fix "conky failes to build with --disable-ncurses" (sf.net #3541329)
|
||||
|
||||
---
|
||||
src/conky.c | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/conky.c b/src/conky.c
|
||||
index c5b4bed..17fe1a7 100644
|
||||
--- a/src/conky.c
|
||||
+++ b/src/conky.c
|
||||
@@ -885,12 +885,12 @@ void generate_text_internal(char *p, int p_max_size,
|
||||
OBJ(cpu) {
|
||||
if (cur->cpu_usage) {
|
||||
if (obj->data.i > info.cpu_count) {
|
||||
- static bool warned = false;
|
||||
+ static int warned = 0;
|
||||
if(!warned) {
|
||||
NORM_ERR("obj->data.i %i info.cpu_count %i",
|
||||
obj->data.i, info.cpu_count);
|
||||
NORM_ERR("attempting to use more CPUs than you have!");
|
||||
- warned = true;
|
||||
+ warned = 1;
|
||||
}
|
||||
} else {
|
||||
percent_print(p, p_max_size,
|
||||
--
|
||||
1.7.0.4
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
--- a/configure.ac.in
|
||||
+++ b/configure.ac.in
|
||||
@@ -134,7 +134,7 @@
|
||||
|
||||
AM_CONDITIONAL(BUILD_NCURSES, test x$want_ncurses = xyes)
|
||||
if test x$want_ncurses = xyes; then
|
||||
- conky_LIBS="$conky_LIBS -lncurses"
|
||||
+ PKG_CHECK_MODULES(ncurses,ncurses,conky_LIBS="$conky_LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses not found]))
|
||||
AC_DEFINE(NCURSES, 1, [Define for ncurses support])
|
||||
AC_CHECK_HEADERS([ncurses.h], [], AC_MSG_ERROR([required header(s) not found]))
|
||||
fi
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -134,7 +134,7 @@
|
||||
|
||||
AM_CONDITIONAL(BUILD_NCURSES, test x$want_ncurses = xyes)
|
||||
if test x$want_ncurses = xyes; then
|
||||
- conky_LIBS="$conky_LIBS -lncurses"
|
||||
+ PKG_CHECK_MODULES(ncurses,ncurses,conky_LIBS="$conky_LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses not found]))
|
||||
AC_DEFINE(NCURSES, 1, [Define for ncurses support])
|
||||
AC_CHECK_HEADERS([ncurses.h], [], AC_MSG_ERROR([required header(s) not found]))
|
||||
fi
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/src/weather.c
|
||||
+++ b/src/weather.c
|
||||
@@ -858,7 +858,7 @@
|
||||
}
|
||||
} else
|
||||
#endif /* XOAP */
|
||||
- if (strstr(uri, "weather.noaa.gov")) {
|
||||
+ if (strstr(uri, "tgftp.nws.noaa.gov")) {
|
||||
strcat(uri, locID);
|
||||
strcat(uri, ".TXT");
|
||||
} else if (!strstr(uri, "localhost") && !strstr(uri, "127.0.0.1")) {
|
||||
@ -1,75 +0,0 @@
|
||||
diff --git a/src/mail.c b/src/mail.c
|
||||
index 7f60ba3..882b7c8 100644
|
||||
--- a/src/mail.c
|
||||
+++ b/src/mail.c
|
||||
@@ -630,8 +630,15 @@ int imap_check_status(char *recvbuf, struct mail_s *mail)
|
||||
|
||||
void imap_unseen_command(struct mail_s *mail, unsigned long old_unseen, unsigned long old_messages)
|
||||
{
|
||||
- if (strlen(mail->command) > 1 && (mail->unseen > old_unseen
|
||||
- || (mail->messages > old_messages && mail->unseen > 0))) {
|
||||
+ /*
|
||||
+ * Georg Hopp (2012-12-23):
|
||||
+ * Well, i will read mails from time to time and i want the unseen
|
||||
+ * count to be reduced when they are read...so, this seems wrong.
|
||||
+ * Try a better one.... :)
|
||||
+ */
|
||||
+ if (strlen(mail->command) > 1
|
||||
+ && (mail->unseen != old_unseen
|
||||
+ || mail->messages != old_messages)) {
|
||||
// new mail goodie
|
||||
if (system(mail->command) == -1) {
|
||||
perror("system()");
|
||||
@@ -813,7 +820,7 @@ static void *imap_thread(void *arg)
|
||||
if (strlen(recvbuf) > 2) {
|
||||
unsigned long messages, recent = 0;
|
||||
char *buf = recvbuf;
|
||||
- char force_check = 0;
|
||||
+ char force_check = 1;
|
||||
buf = strstr(buf, "EXISTS");
|
||||
while (buf && strlen(buf) > 1 && strstr(buf + 1, "EXISTS")) {
|
||||
buf = strstr(buf + 1, "EXISTS");
|
||||
@@ -825,9 +832,7 @@ static void *imap_thread(void *arg)
|
||||
}
|
||||
if (sscanf(buf, "* %lu EXISTS\r\n", &messages) == 1) {
|
||||
timed_thread_lock(mail->p_timed_thread);
|
||||
- if (mail->messages != messages) {
|
||||
- force_check = 1;
|
||||
- }
|
||||
+ force_check = 1;
|
||||
timed_thread_unlock(mail->p_timed_thread);
|
||||
}
|
||||
}
|
||||
@@ -850,7 +855,10 @@ static void *imap_thread(void *arg)
|
||||
* something other than 0, or we had a timeout
|
||||
*/
|
||||
buf = recvbuf;
|
||||
- if (recent > 0 || (buf && strstr(buf, " FETCH ")) || fetchtimeout.tv_sec == 0 || force_check) {
|
||||
+ if (recent > 0
|
||||
+ || (buf && strstr(buf, " FETCH "))
|
||||
+ || (buf && strstr(buf, " EXPUNGE "))
|
||||
+ || fetchtimeout.tv_sec == 0 || force_check) {
|
||||
// re-check messages and unseen
|
||||
if (imap_command(sockfd, "DONE\r\n", recvbuf, "a5 OK")) {
|
||||
fail++;
|
||||
@@ -868,6 +876,9 @@ static void *imap_thread(void *arg)
|
||||
fail++;
|
||||
break;
|
||||
}
|
||||
+ imap_unseen_command(mail, old_unseen, old_messages);
|
||||
+ old_unseen = mail->unseen;
|
||||
+ old_messages = mail->messages;
|
||||
strncpy(sendbuf, "a5 IDLE\r\n", MAXDATASIZE);
|
||||
if (imap_command(sockfd, sendbuf, recvbuf, "+ idling")) {
|
||||
fail++;
|
||||
@@ -886,10 +897,7 @@ static void *imap_thread(void *arg)
|
||||
fail++;
|
||||
break;
|
||||
}
|
||||
- imap_unseen_command(mail, old_unseen, old_messages);
|
||||
fail = 0;
|
||||
- old_unseen = mail->unseen;
|
||||
- old_messages = mail->messages;
|
||||
}
|
||||
if (fail) break;
|
||||
} else {
|
||||
@ -1,4 +1,3 @@
|
||||
DIST mcollective-2.10.0.tar.gz 1509016 SHA256 0a93c7c1c0f10d3e73ab3f255a542e170f7f9eed13ad56cc5cef883bac2e27b0 SHA512 021d52d299adba05c1960a242d7815b5fc3f763163c227d7b11b1bc48db40c147b7ab281a29f60c54f8049acfd8a3489ff837e8cf4a590e1450b2c53435124b1 WHIRLPOOL 67a39f6c82e81da1a90e8a2b02aa4101bcf821f833669715a701c075505501bc4706c68d1ed000d5a6c99c0258b16a2711a470f7145cc452c0780ca588c8ca7b
|
||||
DIST mcollective-2.10.1.tar.gz 1509293 SHA256 b47662b8ab3f150df6153f18c453bad049d8baf0cc8b5589436ae411258492fc SHA512 907bc4bb8527053f0813d19fd9a2fd19701af364d45385356772b09f3db50fd8c4d8e4e53ad9c3ad7c53c78bed52fcfec2354505272302c770c9cfea553309c5 WHIRLPOOL 4e283c42ae8f4161a47e95e1fc223d47fed3bc5308df09b3bd43a7b7d90e1927c2a6067faa872404e261f7e4597e900b7c994266587e8a73c53420d90614b6c6
|
||||
DIST mcollective-2.8.8.tar.gz 1500476 SHA256 503b26cb0beeb505bf9cd2abbb8724c67bc743ffff4fbaddc321e2a4d663b133 SHA512 fad2a277bdcb06adb56e87f545c4b85a4b8039263e7230c7b386c561a04d6f3bf80923733e1087c8090b43da734d6b7efe02e52a757191c3cb3ecab50cc97bb6 WHIRLPOOL 3e7a52b1ce3b705ed6f705067a4ab900a2faa226d19a36f106e2c2c1e4c4fc3e631630c04012ca456f0230f8fcb47dd5bd97f1d2e849af6edde67fac129301d4
|
||||
DIST mcollective-2.10.2.tar.gz 1509434 SHA256 ea067ad540db608ae17a569e74104b26f13e528b78ec6367c2fcfb30b8cea500 SHA512 f3a2dd430c13d77ab09d75f50dd5ab8244a9697a5132ef234fe63a9120acbfc917abcfb7fb26d2ca4c4c86cc554889e3f3a6e651283b0d35f72bb7038dd813e6 WHIRLPOOL 9bf6b28d01d0fa593731b024895adc5f0d92504cf9cf2db02ae94fd8654dd6410b7ef46079632a1aadf702fc7470cf58c47e6bd68f7fb6c15834f9e9b16d3d08
|
||||
DIST mcollective-2.9.1.tar.gz 1504607 SHA256 89bc9fbd72846b22220074a57d19bbfac56473649078fc3ac8182cc728159249 SHA512 29fedacb61084e1952afd3b9deb302abde3e763d13630d85dc70f78b0853f5b353fb44ccbd00e48e5864d04bf2c7568d7cbe21b06af31e1da72e52aeef3c04cf WHIRLPOOL 8affee96fa344d12b34b5a4e120029ab315133df6fd6cd456d840ab608ceb2027b9411a6a1a74bc5b9d0b029968255a926de888b7a2a1183d1c7aed195f65f7a
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="5"
|
||||
|
||||
USE_RUBY="ruby21 ruby22 ruby23"
|
||||
|
||||
inherit ruby-ng
|
||||
|
||||
DESCRIPTION="Framework to build server orchestration or parallel job execution
|
||||
systems"
|
||||
HOMEPAGE="http://marionette-collective.org/"
|
||||
SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/all/marionette-collective-${PV}"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="doc +client"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="dev-ruby/stomp"
|
||||
|
||||
src_compile() {
|
||||
einfo "nothing to compile"
|
||||
}
|
||||
|
||||
each_ruby_install() {
|
||||
cd "marionette-collective-${PV}"
|
||||
doruby -r lib/*
|
||||
insinto /usr/share/mcollective
|
||||
use client && dosbin bin/mco
|
||||
dosbin bin/mcollectived
|
||||
if use doc ; then
|
||||
dohtml -r doc/*
|
||||
insinto /usr/share/doc/${P}/ext
|
||||
doins -r ext/*
|
||||
fi
|
||||
newinitd "${FILESDIR}"/mcollectived.initd mcollectived
|
||||
insinto /etc/mcollective
|
||||
cd etc
|
||||
for cfg in *.dist ; do
|
||||
newins "${cfg}" "${cfg%%.dist}"
|
||||
sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
|
||||
"${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
|
||||
done
|
||||
insinto /etc/mcollective/plugin.d
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "Mcollective requires a stomp server installed and functioning before"
|
||||
einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
|
||||
einfo "any other stomp compatible server should work."
|
||||
einfo
|
||||
einfo "It is recommended you read the \'getting started\' guide [2] if this"
|
||||
einfo "is a new installation"
|
||||
einfo
|
||||
einfo "[1] http://activemq.apache.org/"
|
||||
einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST calibre-2.78.0.tar.xz 38739404 SHA256 d2b0b0c5451d3ac05ce9de0b801ddf8de7664fee45f273d7ee8445a1ec2f898b SHA512 0779ac385dde45ac4baee7cecb0916e245f3e1cf20662bad9d9a4278265390b1aa89c2b478601b57113e7de08a69343288488ee299e8b43332f0129e650aa0ca WHIRLPOOL 325fc344445078ef0df0a29b4cd8e32445a881ede89e3db87606166ff0c8b7db10b7cc34432e63c2bb49382537a5107686339b987f1be807d59a1786ddfd4a75
|
||||
DIST calibre-2.80.0.tar.xz 38781996 SHA256 33a6dbc578c7a2f3d1c97253769506a1afc10f688c062f027d64d7081618f2b1 SHA512 9dc874cd7bfcc883514e354a494a83c63d19b88980df8f28fc03b57d3ebaafb45dad36f0d61e8ef08d363ed18a7bd953e8d624c69f0c3d7f7d66308fceac8982 WHIRLPOOL b40701e810d9a9fab333f420bb1f14a89ac55dd7397407d4f31837efc97d323f74b94181436b8038004e404aff6e9c5696deee89daf1cd949e5659dbe43207c4
|
||||
|
||||
@ -0,0 +1,250 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="sqlite,ssl"
|
||||
|
||||
inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
|
||||
|
||||
DESCRIPTION="Ebook management application"
|
||||
HOMEPAGE="http://calibre-ebook.com/"
|
||||
SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
|
||||
|
||||
LICENSE="
|
||||
GPL-3+
|
||||
GPL-3
|
||||
GPL-2+
|
||||
GPL-2
|
||||
GPL-1+
|
||||
LGPL-3+
|
||||
LGPL-2.1+
|
||||
LGPL-2.1
|
||||
BSD
|
||||
MIT
|
||||
Old-MIT
|
||||
Apache-2.0
|
||||
public-domain
|
||||
|| ( Artistic GPL-1+ )
|
||||
CC-BY-3.0
|
||||
OFL-1.1
|
||||
PSF-2
|
||||
unRAR
|
||||
"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
SLOT="0"
|
||||
IUSE="+udisks"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
COMMON_DEPEND="${PYTHON_DEPS}
|
||||
>=app-text/podofo-0.8.2:=
|
||||
>=app-text/poppler-0.26.5[qt5]
|
||||
>=dev-libs/chmlib-0.40:=
|
||||
dev-libs/glib:2
|
||||
>=dev-libs/icu-4.4:=
|
||||
>=dev-python/apsw-3.7.17[${PYTHON_USEDEP}]
|
||||
>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
|
||||
>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}]
|
||||
>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
|
||||
dev-python/netifaces[${PYTHON_USEDEP}]
|
||||
dev-python/pillow[${PYTHON_USEDEP}]
|
||||
dev-python/psutil[${PYTHON_USEDEP}]
|
||||
>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtwidgets:5
|
||||
media-fonts/liberation-fonts
|
||||
>=media-gfx/imagemagick-6.5.9[jpeg,png]
|
||||
media-libs/fontconfig
|
||||
>=media-libs/freetype-2:=
|
||||
>=media-libs/libmtp-1.1.5:=
|
||||
>=media-libs/libwmf-0.2.8
|
||||
sys-libs/zlib
|
||||
virtual/libusb:1=
|
||||
virtual/python-dnspython[${PYTHON_USEDEP}]
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXrender
|
||||
>=x11-misc/xdg-utils-1.0.2-r2
|
||||
udisks? ( virtual/libudev )"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-python/setuptools-0.6_rc5[${PYTHON_USEDEP}]
|
||||
>=virtual/podofo-build-0.8.2
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
# no_updates: do not annoy user with "new version is availible all the time
|
||||
# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
|
||||
eapply \
|
||||
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
|
||||
"${FILESDIR}/${PN}-disable_plugins.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix outdated version constant.
|
||||
#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
|
||||
# -i src/calibre/constants.py || \
|
||||
# die "sed failed to patch constants.py"
|
||||
|
||||
# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
|
||||
# calls xdg-* (bug #258938).
|
||||
sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
|
||||
-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
|
||||
-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
|
||||
-e "s|, PreserveMIMEDefaults():|:|" \
|
||||
-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
|
||||
-e "s|cmd\[2\]|cmd[4]|" \
|
||||
-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
|
||||
-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
|
||||
-i src/calibre/linux.py || die "sed failed to patch linux.py"
|
||||
|
||||
# Disable unnecessary privilege dropping for bug #287067.
|
||||
sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
|
||||
-i setup/install.py || die "sed failed to patch install.py"
|
||||
|
||||
sed -e "/^ self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
|
||||
\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
|
||||
'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
|
||||
'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
|
||||
'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
|
||||
'-i', 'Makefile'])" \
|
||||
-i setup/build.py || die "sed failed to patch build.py"
|
||||
|
||||
# use system beautifulsoup, instead of bundled
|
||||
rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
|
||||
|| die "could not remove bundled beautifulsoup"
|
||||
find "${S}" -type f -name \*.py -exec \
|
||||
sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
|
||||
|| die "could not sed bundled beautifulsoup out of the source tree"
|
||||
|
||||
# avoid failure of xdg tools to recognize vendor prefix
|
||||
sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
|
||||
-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
|
||||
-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
|
||||
-i "${S}"/src/calibre/linux.py || die 'sed failed'
|
||||
|
||||
# don't create/install uninstaller
|
||||
sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Bypass kbuildsycoca and update-mime-database in order to
|
||||
# avoid sandbox violations if xdg-mime tries to call them.
|
||||
cat - > "${T}/kbuildsycoca" <<-EOF
|
||||
#!${BASH}
|
||||
echo $0 : $@
|
||||
exit 0
|
||||
EOF
|
||||
|
||||
cp "${T}"/{kbuildsycoca,update-mime-database} || die
|
||||
chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
|
||||
|
||||
export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
|
||||
|
||||
# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
|
||||
# violation with kbuildsycoca as in bug #287067, comment #13.
|
||||
export -n DISPLAY
|
||||
|
||||
# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
|
||||
# File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
|
||||
# return _parse_localename(localename)
|
||||
# File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
|
||||
# raise ValueError, 'unknown locale: %s' % localename
|
||||
#ValueError: unknown locale: 46
|
||||
export -n LANGUAGE
|
||||
|
||||
# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
|
||||
# variables to point to our fake temporary $HOME.
|
||||
export HOME="${T}/fake_homedir"
|
||||
export XDG_CONFIG_HOME="${HOME}/.config"
|
||||
export XDG_DATA_HOME="${HOME}/.local/share"
|
||||
export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
|
||||
mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
|
||||
|
||||
tc-export CC CXX
|
||||
# Bug #334243 - respect LDFLAGS when building extensions
|
||||
export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
|
||||
local libdir=$(get_libdir)
|
||||
[[ -n $libdir ]] || die "get_libdir returned an empty string"
|
||||
|
||||
# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
|
||||
local x
|
||||
for x in /dev/dri/card[0-9] ; do
|
||||
[[ -e ${x} ]] && addpredict ${x}
|
||||
done
|
||||
|
||||
#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
|
||||
#dodir $(python_get_sitedir)
|
||||
PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
|
||||
"${PYTHON}" setup.py install \
|
||||
--root="${D}" \
|
||||
--prefix="${EPREFIX}/usr" \
|
||||
--libdir="${EPREFIX}/usr/${libdir}" \
|
||||
--staging-root="${ED}usr" \
|
||||
--staging-libdir="${ED}usr/${libdir}" || die
|
||||
|
||||
# The menu entries end up here due to '--mode user' being added to
|
||||
# xdg-* options in src_prepare.
|
||||
dodir /usr/share/mime/packages
|
||||
chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
|
||||
mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
|
||||
die "failed to register mime types"
|
||||
dodir /usr/share/icons
|
||||
mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
|
||||
die "failed to install icon files"
|
||||
|
||||
domenu "${HOME}"/.local/share/applications/*.desktop ||
|
||||
die "failed to install .desktop menu files"
|
||||
|
||||
find "${ED}"usr/share -type d -empty -delete
|
||||
|
||||
cd "${ED}"/usr/share/calibre/fonts/liberation || die
|
||||
local x
|
||||
for x in * ; do
|
||||
[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
|
||||
ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
|
||||
done
|
||||
|
||||
einfo "Converting python shebangs"
|
||||
python_fix_shebang "${ED}"
|
||||
|
||||
einfo "Compiling python modules"
|
||||
python_optimize "${ED}"usr/lib/calibre
|
||||
|
||||
newinitd "${FILESDIR}"/calibre-server.init calibre-server
|
||||
newconfd "${FILESDIR}"/calibre-server.conf calibre-server
|
||||
|
||||
bashcomp_alias calibre \
|
||||
lrfviewer \
|
||||
calibre-debug \
|
||||
ebook-meta \
|
||||
calibre-server \
|
||||
ebook-viewer \
|
||||
ebook-polish \
|
||||
fetch-ebook-metadata \
|
||||
lrf2lrs \
|
||||
ebook-convert \
|
||||
ebook-edit \
|
||||
calibre-smtp \
|
||||
ebook-device
|
||||
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
--- calibre.orig/src/calibre/gui2/main.py 2014-01-17 11:49:16.000000000 +0800
|
||||
+++ calibre/src/calibre/gui2/main.py 2014-01-18 18:28:53.322911344 +0800
|
||||
@@ -37,8 +37,9 @@
|
||||
help=_('Start minimized to system tray.'))
|
||||
parser.add_option('-v', '--verbose', default=0, action='count',
|
||||
help=_('Ignored, do not use. Present only for legacy reasons'))
|
||||
- parser.add_option('--no-update-check', default=False, action='store_true',
|
||||
- help=_('Do not check for updates'))
|
||||
+ parser.add_option('--update-check', dest='no_update_check', default=True,
|
||||
+ action='store_false',
|
||||
+ help=_('Check for updates'))
|
||||
parser.add_option('--ignore-plugins', default=False, action='store_true',
|
||||
help=_('Ignore custom plugins, useful if you installed a plugin'
|
||||
' that is preventing calibre from starting'))
|
||||
@ -1,6 +1,2 @@
|
||||
DIST mysql-extras-20160818-1822Z.tar.bz2 302657 SHA256 7e4f42ea0754af120d2ad6b4a3e40dd9bd5a769913ac141453a2c53419bd6c05 SHA512 19bd509fd1a37c537ae28919516406735cdf3d3fbc66583f765b64b3d296bd041cf2bc2291004b7274604a2fda3cb399141d6c672ae5d6f8aced3d019ac81826 WHIRLPOOL 46b4e3c7f415b2de1440aa9d190805dfbc49a8f4a6ed26be5e4bb3e3e9553885cc7e7e13c83c49fadf71a6081bb8fd9d28d5f4d8372540c89a649f2d913fdd9b
|
||||
DIST mysql-extras-20161130-2354Z.tar.bz2 303863 SHA256 b18ce4ccfd023106a802bcb2e17a5bc3a1ec4d99e7bf7f45d047cf18ebb9ad1b SHA512 6c24c581fd471c4ce0ff20ed68bdb32150e310a2f8f000c8bb9892ab98302127f3427165b17967da3f5663e1da5a7f1d26f84021d4cb8292cbb5e0c241505113 WHIRLPOOL de6d896474faedf1d3696e346877cb03fb9908338d66f2b901aa83a24983ec3e0ea5f7f54dfd190bdf7a55f72bb580e21ab826850018ae25629b572cbabf532d
|
||||
DIST percona-server-5.6.32-78.1.tar.gz 55115483 SHA256 d94d73bf12459c57fcc8fa8018d7a08775d45ba718999a4ef0a09f543c654778 SHA512 77788932e83c3e3e4bbaa143844a11c809e0cbd87afbdc0f76ea12c462581d7438246d61984f82fe5174c2a099ea38274aa61957b05c6fc5a101a52028477b41 WHIRLPOOL 87561c8ce13809518b0a4fb2429cac9ef6667eedf0dad742f349e8f15736cf8249e4955eb1f49f579ab7cac550409603171b9003bf523c87603b3a2f38fd4ac0
|
||||
DIST percona-server-5.6.33-79.0.tar.gz 55184504 SHA256 ed8372340740faca1f58735938823eaf65ffbda64a5c65b18d187b959afbd34e SHA512 5a31f9aecf9ec4515e46dcddc614989fbbbd7b23af9c5b351eac30ede3399358413b6f9b204628a12e3260a5e1d6ed94e70769ae487728c27796c81ea0282c85 WHIRLPOOL c341746eb053a74c02df47ea24a3e941bbdc89b840abadf68668e403dc50e071a9f96d429a8bead17b269d2a602bff35b8588179714d99372e068c0494db93c2
|
||||
DIST percona-server-5.6.34-79.1.tar.gz 55763384 SHA256 8db1906e8fae2ac10faa23f44663f083762edd954a8efae2c798bc671b9d12d6 SHA512 3691daf14042cb35ab8cfe487c760e3da8f0758384224511ef84f388f895a5e15cbbf1a5ae1022d8a9d8ff7ee8ae7651ec8f39381cefce14b4f0fe3f2de2608b WHIRLPOOL 03911d171699ecf2c07e27fbdc82baa19a1fb72e2f0cbe17b107b49594e1c7755ae4ace5c2b74576517c262d6a812d0aa376c776e5f87f67c7f57bae37c6f4fd
|
||||
DIST percona-server-5.6.35-80.0.tar.gz 55839147 SHA256 259b5aa2c6218958c8cc55170b9381955ea60445127bf46e02aa09903af7f26b SHA512 78b0b9cd69f26dc3ac13e4c6165590736d723b0f07d18a8ac1056281522de22b67d9fd931b035962bc278c97775fe7f98c46791328ece286268c7d31a484b69d WHIRLPOOL a6a6f78f41b1f8b5c26d0899efa6b043256749f4082ae9bffafe9210c3a326f33fe512a4c6578984892797e4f2c94de88ceca4c8c983cde7096cf01e88dec9b7
|
||||
|
||||
@ -1,215 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
MY_EXTRAS_VER="20160818-1822Z"
|
||||
SUBSLOT="18"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit linux-info python-any-r1 mysql-multilib-r1
|
||||
|
||||
IUSE="numa pam tokudb tokudb-backup-plugin"
|
||||
|
||||
# REMEMBER: also update eclass/mysql*.eclass before committing!
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
|
||||
HOMEPAGE="http://www.percona.com/software/percona-server"
|
||||
DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team"
|
||||
|
||||
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
|
||||
EPATCH_EXCLUDE=''
|
||||
|
||||
COMMON_DEPEND="numa? ( sys-process/numactl:= )
|
||||
server? ( pam? ( virtual/pam:0= ) )
|
||||
tokudb? ( app-arch/snappy )
|
||||
tokudb-backup-plugin? ( dev-util/valgrind )
|
||||
"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
|
||||
test? ( $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]') )"
|
||||
RDEPEND="${COMMON_DEPEND}"
|
||||
|
||||
REQUIRED_USE="tokudb? ( jemalloc ) tokudb-backup-plugin? ( tokudb )"
|
||||
|
||||
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
|
||||
|
||||
PATCHES=(
|
||||
"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
|
||||
"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
|
||||
"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch
|
||||
"${MY_PATCH_DIR}"/20006_all_cmake_elib-percona-5.6.29.patch
|
||||
"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
|
||||
"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink.patch
|
||||
"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
|
||||
"${MY_PATCH_DIR}"/20018_all_percona-server-5.6.25-without-clientlibs-tools.patch
|
||||
)
|
||||
|
||||
# Please do not add a naive src_unpack to this ebuild
|
||||
# If you want to add a single patch, copy the ebuild to an overlay
|
||||
# and create your own mysql-extras tarball, looking at 000_index.txt
|
||||
|
||||
pkg_pretend() {
|
||||
mysql-multilib-r1_pkg_pretend
|
||||
|
||||
if use numa; then
|
||||
local CONFIG_CHECK="~NUMA"
|
||||
|
||||
local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
|
||||
WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
|
||||
|
||||
check_extra_config
|
||||
fi
|
||||
}
|
||||
|
||||
python_check_deps() {
|
||||
has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITH_NUMA=$(usex numa)
|
||||
-DWITH_PAM=$(usex pam)
|
||||
$(mysql-cmake_use_plugin tokudb TOKUDB)
|
||||
)
|
||||
if use tokudb ; then
|
||||
# TokuDB Backup plugin requires valgrind unconditionally
|
||||
MYSQL_CMAKE_NATIVE_DEFINES+=(
|
||||
$(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1)
|
||||
)
|
||||
fi
|
||||
mysql-multilib-r1_src_configure
|
||||
}
|
||||
|
||||
# Official test instructions:
|
||||
# USE='extraengine perl openssl static-libs' \
|
||||
# FEATURES='test userpriv -usersandbox' \
|
||||
# ebuild percona-server-X.X.XX.ebuild \
|
||||
# digest clean package
|
||||
multilib_src_test() {
|
||||
|
||||
if ! multilib_is_native_abi ; then
|
||||
einfo "Server tests not available on non-native abi".
|
||||
return 0;
|
||||
fi
|
||||
|
||||
if ! use server ; then
|
||||
einfo "Skipping server tests due to minimal build."
|
||||
return 0
|
||||
fi
|
||||
|
||||
local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
|
||||
local retstatus_unit
|
||||
local retstatus_tests
|
||||
|
||||
# Bug #213475 - MySQL _will_ object strenously if your machine is named
|
||||
# localhost. Also causes weird failures.
|
||||
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
|
||||
|
||||
if [[ $UID -eq 0 ]]; then
|
||||
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
|
||||
fi
|
||||
|
||||
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
|
||||
# Silence repoman, this is only valid in tests
|
||||
if use test ; then
|
||||
addpredict /this-dir-does-not-exist/t9.MYI
|
||||
fi
|
||||
|
||||
# Run CTest (test-units)
|
||||
cmake-utils_src_test
|
||||
retstatus_unit=$?
|
||||
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
|
||||
|
||||
# Ensure that parallel runs don't die
|
||||
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
|
||||
# Enable parallel testing, auto will try to detect number of cores
|
||||
# You may set this by hand.
|
||||
# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
|
||||
export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
|
||||
|
||||
# create directories because mysqladmin might right out of order
|
||||
mkdir -p "${T}"/var-tests{,/log}
|
||||
|
||||
# These are failing in Percona 5.6 for now and are believed to be
|
||||
# false positives:
|
||||
#
|
||||
# main.information_schema, binlog.binlog_statement_insert_delayed,
|
||||
# main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter
|
||||
# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt
|
||||
# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers
|
||||
# engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate
|
||||
# engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8
|
||||
# engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate
|
||||
# fails due to USE=-latin1 / utf8 default
|
||||
#
|
||||
# main.mysql_client_test:
|
||||
# segfaults at random under Portage only, suspect resource limits.
|
||||
#
|
||||
# main.percona_bug1289599
|
||||
# Looks to be a syntax error in the test file itself
|
||||
#
|
||||
# main.variables main.myisam main.merge_recover
|
||||
# fails due to ulimit not able to open enough files (needs 5000)
|
||||
#
|
||||
# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
|
||||
# Called with bad parameters should be reported upstream
|
||||
#
|
||||
|
||||
local t
|
||||
|
||||
for t in main.mysql_client_test \
|
||||
binlog.binlog_statement_insert_delayed main.information_schema \
|
||||
main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \
|
||||
perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
|
||||
funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
|
||||
main.variables main.myisam main.merge_recover \
|
||||
engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \
|
||||
engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
|
||||
engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
|
||||
main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
|
||||
mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
|
||||
done
|
||||
|
||||
if use numa && use kernel_linux ; then
|
||||
# bug 584880
|
||||
if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then
|
||||
for t in sys_vars.innodb_buffer_pool_populate_basic ; do
|
||||
mysql-multilib-r1_disable_test "$t" "Test $t requires system with NUMA support"
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! use extraengine ; then
|
||||
# bug 401673, 530766
|
||||
for t in federated.federated_plugin ; do
|
||||
mysql-multilib-r1_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
|
||||
done
|
||||
fi
|
||||
|
||||
# Run mysql tests
|
||||
pushd "${TESTDIR}" || die
|
||||
|
||||
# Set file limits higher so tests run
|
||||
ulimit -n 3000
|
||||
python_setup
|
||||
# run mysql-test tests
|
||||
perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
|
||||
--testcase-timeout=30 --reorder
|
||||
retstatus_tests=$?
|
||||
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
|
||||
|
||||
popd || die
|
||||
|
||||
# Cleanup is important for these testcases.
|
||||
pkill -9 -f "${S}/ndb" 2>/dev/null
|
||||
pkill -9 -f "${S}/sql" 2>/dev/null
|
||||
|
||||
failures=""
|
||||
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
|
||||
[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
|
||||
|
||||
if [[ -n "$failures" ]]; then
|
||||
has usersandbox $FEATURES && eerror "Some tests may have failed due to FEATURES=usersandbox"
|
||||
die "Test failures: $failures"
|
||||
fi
|
||||
|
||||
einfo "Tests successfully completed"
|
||||
}
|
||||
@ -1,211 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
MY_EXTRAS_VER="20160818-1822Z"
|
||||
SUBSLOT="18"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit linux-info python-any-r1 mysql-multilib-r1
|
||||
|
||||
IUSE="numa pam tokudb tokudb-backup-plugin"
|
||||
|
||||
# REMEMBER: also update eclass/mysql*.eclass before committing!
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
|
||||
HOMEPAGE="http://www.percona.com/software/percona-server"
|
||||
DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team"
|
||||
|
||||
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
|
||||
EPATCH_EXCLUDE=''
|
||||
|
||||
COMMON_DEPEND="numa? ( sys-process/numactl:= )
|
||||
server? ( pam? ( virtual/pam:0= ) )
|
||||
tokudb? ( app-arch/snappy )
|
||||
tokudb-backup-plugin? ( dev-util/valgrind )
|
||||
"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
|
||||
test? ( $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]') )"
|
||||
RDEPEND="${COMMON_DEPEND}"
|
||||
|
||||
REQUIRED_USE="tokudb? ( jemalloc ) tokudb-backup-plugin? ( tokudb )"
|
||||
|
||||
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
|
||||
|
||||
PATCHES=(
|
||||
"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
|
||||
"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
|
||||
"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch
|
||||
"${MY_PATCH_DIR}"/20006_all_cmake_elib-percona-5.6.29.patch
|
||||
"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
|
||||
"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink.patch
|
||||
"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
|
||||
"${MY_PATCH_DIR}"/20018_all_percona-server-5.6.25-without-clientlibs-tools.patch
|
||||
)
|
||||
|
||||
# Please do not add a naive src_unpack to this ebuild
|
||||
# If you want to add a single patch, copy the ebuild to an overlay
|
||||
# and create your own mysql-extras tarball, looking at 000_index.txt
|
||||
|
||||
pkg_pretend() {
|
||||
mysql-multilib-r1_pkg_pretend
|
||||
|
||||
if use numa; then
|
||||
local CONFIG_CHECK="~NUMA"
|
||||
|
||||
local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
|
||||
WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
|
||||
|
||||
check_extra_config
|
||||
fi
|
||||
}
|
||||
|
||||
python_check_deps() {
|
||||
has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITH_NUMA=$(usex numa)
|
||||
-DWITH_PAM=$(usex pam)
|
||||
$(mysql-cmake_use_plugin tokudb TOKUDB)
|
||||
)
|
||||
if use tokudb ; then
|
||||
# TokuDB Backup plugin requires valgrind unconditionally
|
||||
MYSQL_CMAKE_NATIVE_DEFINES+=(
|
||||
$(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1)
|
||||
)
|
||||
fi
|
||||
mysql-multilib-r1_src_configure
|
||||
}
|
||||
|
||||
# Official test instructions:
|
||||
# USE='extraengine perl openssl static-libs' \
|
||||
# FEATURES='test userpriv -usersandbox' \
|
||||
# ebuild percona-server-X.X.XX.ebuild \
|
||||
# digest clean package
|
||||
multilib_src_test() {
|
||||
|
||||
if ! multilib_is_native_abi ; then
|
||||
einfo "Server tests not available on non-native abi".
|
||||
return 0;
|
||||
fi
|
||||
|
||||
if ! use server ; then
|
||||
einfo "Skipping server tests due to minimal build."
|
||||
return 0
|
||||
fi
|
||||
|
||||
local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
|
||||
local retstatus_unit
|
||||
local retstatus_tests
|
||||
|
||||
# Bug #213475 - MySQL _will_ object strenously if your machine is named
|
||||
# localhost. Also causes weird failures.
|
||||
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
|
||||
|
||||
if [[ $UID -eq 0 ]]; then
|
||||
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
|
||||
fi
|
||||
|
||||
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
|
||||
|
||||
# Run CTest (test-units)
|
||||
cmake-utils_src_test
|
||||
retstatus_unit=$?
|
||||
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
|
||||
|
||||
# Ensure that parallel runs don't die
|
||||
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
|
||||
# Enable parallel testing, auto will try to detect number of cores
|
||||
# You may set this by hand.
|
||||
# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
|
||||
export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
|
||||
|
||||
# create directories because mysqladmin might right out of order
|
||||
mkdir -p "${T}"/var-tests{,/log}
|
||||
|
||||
# These are failing in Percona 5.6 for now and are believed to be
|
||||
# false positives:
|
||||
#
|
||||
# main.information_schema, binlog.binlog_statement_insert_delayed,
|
||||
# main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter
|
||||
# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt
|
||||
# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers
|
||||
# engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate
|
||||
# engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8
|
||||
# engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate
|
||||
# fails due to USE=-latin1 / utf8 default
|
||||
#
|
||||
# main.mysql_client_test:
|
||||
# segfaults at random under Portage only, suspect resource limits.
|
||||
#
|
||||
# main.percona_bug1289599
|
||||
# Looks to be a syntax error in the test file itself
|
||||
#
|
||||
# main.variables main.myisam main.merge_recover
|
||||
# fails due to ulimit not able to open enough files (needs 5000)
|
||||
#
|
||||
# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
|
||||
# Called with bad parameters should be reported upstream
|
||||
#
|
||||
|
||||
local t
|
||||
|
||||
for t in main.mysql_client_test \
|
||||
binlog.binlog_statement_insert_delayed main.information_schema \
|
||||
main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \
|
||||
perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
|
||||
funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
|
||||
main.variables main.myisam main.merge_recover \
|
||||
engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \
|
||||
engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
|
||||
engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
|
||||
main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
|
||||
mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
|
||||
done
|
||||
|
||||
if use numa && use kernel_linux ; then
|
||||
# bug 584880
|
||||
if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then
|
||||
for t in sys_vars.innodb_buffer_pool_populate_basic ; do
|
||||
mysql-multilib-r1_disable_test "$t" "Test $t requires system with NUMA support"
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! use extraengine ; then
|
||||
# bug 401673, 530766
|
||||
for t in federated.federated_plugin ; do
|
||||
mysql-multilib-r1_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
|
||||
done
|
||||
fi
|
||||
|
||||
# Run mysql tests
|
||||
pushd "${TESTDIR}" || die
|
||||
|
||||
# Set file limits higher so tests run
|
||||
ulimit -n 3000
|
||||
python_setup
|
||||
# run mysql-test tests
|
||||
perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
|
||||
--testcase-timeout=30 --reorder
|
||||
retstatus_tests=$?
|
||||
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
|
||||
|
||||
popd || die
|
||||
|
||||
# Cleanup is important for these testcases.
|
||||
pkill -9 -f "${S}/ndb" 2>/dev/null
|
||||
pkill -9 -f "${S}/sql" 2>/dev/null
|
||||
|
||||
failures=""
|
||||
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
|
||||
[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
|
||||
|
||||
if [[ -n "$failures" ]]; then
|
||||
has usersandbox $FEATURES && eerror "Some tests may have failed due to FEATURES=usersandbox"
|
||||
die "Test failures: $failures"
|
||||
fi
|
||||
|
||||
einfo "Tests successfully completed"
|
||||
}
|
||||
@ -1,211 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
MY_EXTRAS_VER="20161130-2354Z"
|
||||
SUBSLOT="18"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit linux-info python-any-r1 mysql-multilib-r1
|
||||
|
||||
IUSE="numa pam tokudb tokudb-backup-plugin"
|
||||
|
||||
# REMEMBER: also update eclass/mysql*.eclass before committing!
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
|
||||
HOMEPAGE="http://www.percona.com/software/percona-server"
|
||||
DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team"
|
||||
|
||||
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
|
||||
EPATCH_EXCLUDE=''
|
||||
|
||||
COMMON_DEPEND="numa? ( sys-process/numactl:= )
|
||||
server? ( pam? ( virtual/pam:0= ) )
|
||||
tokudb? ( app-arch/snappy )
|
||||
tokudb-backup-plugin? ( dev-util/valgrind )
|
||||
"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
|
||||
test? ( $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]') )"
|
||||
RDEPEND="${COMMON_DEPEND}"
|
||||
|
||||
REQUIRED_USE="tokudb? ( jemalloc ) tokudb-backup-plugin? ( tokudb )"
|
||||
|
||||
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
|
||||
|
||||
PATCHES=(
|
||||
"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
|
||||
"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
|
||||
"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch
|
||||
"${MY_PATCH_DIR}"/20006_all_cmake_elib-percona-5.6.34.patch
|
||||
"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
|
||||
"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink.patch
|
||||
"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
|
||||
"${MY_PATCH_DIR}"/20018_all_percona-server-5.6.25-without-clientlibs-tools.patch
|
||||
)
|
||||
|
||||
# Please do not add a naive src_unpack to this ebuild
|
||||
# If you want to add a single patch, copy the ebuild to an overlay
|
||||
# and create your own mysql-extras tarball, looking at 000_index.txt
|
||||
|
||||
pkg_pretend() {
|
||||
mysql-multilib-r1_pkg_pretend
|
||||
|
||||
if use numa; then
|
||||
local CONFIG_CHECK="~NUMA"
|
||||
|
||||
local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
|
||||
WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
|
||||
|
||||
check_extra_config
|
||||
fi
|
||||
}
|
||||
|
||||
python_check_deps() {
|
||||
has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITH_NUMA=$(usex numa)
|
||||
-DWITH_PAM=$(usex pam)
|
||||
$(mysql-cmake_use_plugin tokudb TOKUDB)
|
||||
)
|
||||
if use tokudb ; then
|
||||
# TokuDB Backup plugin requires valgrind unconditionally
|
||||
MYSQL_CMAKE_NATIVE_DEFINES+=(
|
||||
$(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1)
|
||||
)
|
||||
fi
|
||||
mysql-multilib-r1_src_configure
|
||||
}
|
||||
|
||||
# Official test instructions:
|
||||
# USE='extraengine perl openssl static-libs' \
|
||||
# FEATURES='test userpriv -usersandbox' \
|
||||
# ebuild percona-server-X.X.XX.ebuild \
|
||||
# digest clean package
|
||||
multilib_src_test() {
|
||||
|
||||
if ! multilib_is_native_abi ; then
|
||||
einfo "Server tests not available on non-native abi".
|
||||
return 0;
|
||||
fi
|
||||
|
||||
if ! use server ; then
|
||||
einfo "Skipping server tests due to minimal build."
|
||||
return 0
|
||||
fi
|
||||
|
||||
local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
|
||||
local retstatus_unit
|
||||
local retstatus_tests
|
||||
|
||||
# Bug #213475 - MySQL _will_ object strenously if your machine is named
|
||||
# localhost. Also causes weird failures.
|
||||
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
|
||||
|
||||
if [[ $UID -eq 0 ]]; then
|
||||
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
|
||||
fi
|
||||
|
||||
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
|
||||
|
||||
# Run CTest (test-units)
|
||||
cmake-utils_src_test
|
||||
retstatus_unit=$?
|
||||
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
|
||||
|
||||
# Ensure that parallel runs don't die
|
||||
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
|
||||
# Enable parallel testing, auto will try to detect number of cores
|
||||
# You may set this by hand.
|
||||
# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
|
||||
export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
|
||||
|
||||
# create directories because mysqladmin might right out of order
|
||||
mkdir -p "${T}"/var-tests{,/log}
|
||||
|
||||
# These are failing in Percona 5.6 for now and are believed to be
|
||||
# false positives:
|
||||
#
|
||||
# main.information_schema, binlog.binlog_statement_insert_delayed,
|
||||
# main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter
|
||||
# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt
|
||||
# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers
|
||||
# engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate
|
||||
# engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8
|
||||
# engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate
|
||||
# fails due to USE=-latin1 / utf8 default
|
||||
#
|
||||
# main.mysql_client_test:
|
||||
# segfaults at random under Portage only, suspect resource limits.
|
||||
#
|
||||
# main.percona_bug1289599
|
||||
# Looks to be a syntax error in the test file itself
|
||||
#
|
||||
# main.variables main.myisam main.merge_recover
|
||||
# fails due to ulimit not able to open enough files (needs 5000)
|
||||
#
|
||||
# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
|
||||
# Called with bad parameters should be reported upstream
|
||||
#
|
||||
|
||||
local t
|
||||
|
||||
for t in main.mysql_client_test \
|
||||
binlog.binlog_statement_insert_delayed main.information_schema \
|
||||
main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \
|
||||
perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
|
||||
funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
|
||||
main.variables main.myisam main.merge_recover \
|
||||
engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \
|
||||
engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
|
||||
engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
|
||||
main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
|
||||
mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
|
||||
done
|
||||
|
||||
if use numa && use kernel_linux ; then
|
||||
# bug 584880
|
||||
if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then
|
||||
for t in sys_vars.innodb_buffer_pool_populate_basic ; do
|
||||
mysql-multilib-r1_disable_test "$t" "Test $t requires system with NUMA support"
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! use extraengine ; then
|
||||
# bug 401673, 530766
|
||||
for t in federated.federated_plugin ; do
|
||||
mysql-multilib-r1_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
|
||||
done
|
||||
fi
|
||||
|
||||
# Run mysql tests
|
||||
pushd "${TESTDIR}" || die
|
||||
|
||||
# Set file limits higher so tests run
|
||||
ulimit -n 3000
|
||||
python_setup
|
||||
# run mysql-test tests
|
||||
perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
|
||||
--testcase-timeout=30 --reorder
|
||||
retstatus_tests=$?
|
||||
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
|
||||
|
||||
popd || die
|
||||
|
||||
# Cleanup is important for these testcases.
|
||||
pkill -9 -f "${S}/ndb" 2>/dev/null
|
||||
pkill -9 -f "${S}/sql" 2>/dev/null
|
||||
|
||||
failures=""
|
||||
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
|
||||
[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
|
||||
|
||||
if [[ -n "$failures" ]]; then
|
||||
has usersandbox $FEATURES && eerror "Some tests may have failed due to FEATURES=usersandbox"
|
||||
die "Test failures: $failures"
|
||||
fi
|
||||
|
||||
einfo "Tests successfully completed"
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST entrypoints-0.2.1.tar.gz 11126 SHA256 0d6b6798446c2e5e5dd6691e79356c29e82234bdb67995233f57413a11f2ded4 SHA512 67a24fc53ae8bdac6bda163d2c8057b158979d55ccdbcdb8709966573bf0a999728e04eb92a05fbc2c0d532593de0ec6518bcfed1d5bcf875b00bbd5c48494c7 WHIRLPOOL f673fb42bad930bb1907692013df469d64b9afb77c3e0acca250fb0b14fe17ec3962cb60de2f0760ede40c8f039690851424b816e047669916ff1d73389daaf7
|
||||
DIST entrypoints-0.2.2.tar.gz 11162 SHA256 e54b5df8bb971507278c65df96e6486cf4aea0cdac384d0102ea0339e0a4f82b SHA512 c987807924f92fd6bc0aab1cccaa4b204587d4f34932c353033ed062fff5adf69bfdc8767f095dda15fff9b57e2be2d205bfa44abc5ad7f7820114e0355a6e99 WHIRLPOOL 9d884c8977f8ea49f23f3c8a6b8ac3d48de6e6ff1133f53afe7072e180fd714019c9076b553deae5595d2383a02728412a8536ea26f4a1a56a8d552806054da9
|
||||
|
||||
@ -0,0 +1,56 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Discover and load entry points from installed packages"
|
||||
HOMEPAGE="https://github.com/takluyver/entrypoints"
|
||||
SRC_URI="https://github.com//takluyver/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc test"
|
||||
|
||||
DEPEND="
|
||||
$(python_gen_cond_dep '>=dev-python/configparser-3.5.0[${PYTHON_USEDEP}]' 'python2*')
|
||||
test? (
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
virtual/python-pathlib[${PYTHON_USEDEP}]
|
||||
)
|
||||
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}"-setup.py.patch
|
||||
"${FILESDIR}/${PN}"-0.2.1-init.py.patch
|
||||
)
|
||||
|
||||
python_prepare_all() {
|
||||
# Prevent un-needed download during build
|
||||
if use doc; then
|
||||
sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
|
||||
fi
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
|
||||
mv "${WORKDIR}/${P}"/entrypoints.py "${WORKDIR}/${P}/${PN}/" || die
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
if use doc; then
|
||||
emake -C doc html
|
||||
HTML_DOCS=( doc/_build/html/. )
|
||||
fi
|
||||
}
|
||||
|
||||
python_test() {
|
||||
distutils_install_for_testing
|
||||
cd "${TEST_DIR}"/lib || die
|
||||
cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
|
||||
py.test || die
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
setup.py for entrypoints by Marius Brehler <marbre@linux.sungazer.de>.
|
||||
|
||||
Patch by Marius Brehler <marbrbre@linux.sungazer.de>.
|
||||
--- /dev/null
|
||||
+++ b/setup.py
|
||||
@@ -0,0 +1,13 @@
|
||||
+from distutils.core import setup
|
||||
+
|
||||
+setup(name='entrypoints',
|
||||
+ version='0.2.2',
|
||||
+ description='Discover and load entry points from installed packages.',
|
||||
+ author='Thomas Kluyver',
|
||||
+ author_email='thomas@kluyver.me.uk',
|
||||
+ url='https://github.com/takluyver/entrypoints',
|
||||
+ packages=['entrypoints'],
|
||||
+ classifiers=[
|
||||
+ 'License :: OSI Approved :: MIT License'
|
||||
+ ]
|
||||
+)
|
||||
\ No newline at end of file
|
||||
@ -0,0 +1 @@
|
||||
DIST ipynb-0.5.tar.gz 50633 SHA256 b7d5d462c1c1738befbc471f5032d2f8e2991adeb81df2f4def27c00dbff2fe5 SHA512 6723551aedf8cbcf65c72629c39858c358aee634c38ce7fac9ffec79db2e80a1775b60a5234dbcfaa0202e7b2ea633ba6cdd5d823f6460e736bc58b8616ae54c WHIRLPOOL b836dc128e2a2a6822b6d22667ef822896a74f17f5006183fff16705d2db82a2fd78362ed6886529c2ca9a3fe10d5773894483415f95158eeba454396dad87a3
|
||||
@ -0,0 +1,17 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python3_{4,5} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Package/Module importer for importing code from Jupyter Notebook files"
|
||||
HOMEPAGE="http://ipython.org/"
|
||||
SRC_URI="https://github.com/ipython/ipynb/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>marbre@linux.sungazer.de</email>
|
||||
<name>Marius Brehler</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>sci@gentoo.org</email>
|
||||
<name>Gentoo Science Project</name>
|
||||
</maintainer>
|
||||
<longdescription>A python package providing an easy way to explicitly import Jupyter Notebooks files (.ipynb) the same way you would import regular .py files.</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="pypi">ipynb</remote-id>
|
||||
<remote-id type="github">ipython/ipynb</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1 @@
|
||||
DIST matplotlib2tikz-0.6.2.tar.gz 26358 SHA256 a81b1a09e8c0efc9944d673023d3a8c14ca38aec04af487c427f20872555ff09 SHA512 b60f378f947ec51be82fc45dafad14ef2700babb2ec72886480aff9bd84d591bc15e0626f38018f2d351ab8293109b2fc12cc4912eb933528b5334b2ef8ecfb7 WHIRLPOOL befa7a990cc4246c2a3357c72b4c34ec76e44af905c0d19312eccbf5ce8e5c8742f906484214ab50466992ae3fed40c5ffbb84e8b80bb06cea830f892a9c947e
|
||||
@ -0,0 +1,15 @@
|
||||
Remove version checks using pipdated.
|
||||
|
||||
Patch by Marius Brehler <marbre@linux.sungazer.de>
|
||||
--- a/matplotlib2tikz/__init__.py
|
||||
+++ b/matplotlib2tikz/__init__.py
|
||||
@@ -15,9 +15,3 @@ from matplotlib2tikz.__about__ import (
|
||||
)
|
||||
|
||||
from matplotlib2tikz.save import save
|
||||
-
|
||||
-import pipdated
|
||||
-if pipdated.needs_checking('matplotlib2tikz'):
|
||||
- msg = pipdated.check('matplotlib2tikz', __version__)
|
||||
- if msg:
|
||||
- print(msg)
|
||||
@ -0,0 +1,25 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
|
||||
HOMEPAGE="https://github.com/nschloe/matplotlib2tikz"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-0.6-init_pipdated.patch" )
|
||||
|
||||
RDEPEND="
|
||||
dev-python/matplotlib[${PYTHON_USEDEP}]
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
dev-python/pillow[${PYTHON_USEDEP}]"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>marbre@linux.sungazer.de</email>
|
||||
<name>Marius Brehler</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>sci@gentoo.org</email>
|
||||
<name>Gentoo Science Project</name>
|
||||
</maintainer>
|
||||
<longdescription>matplotlib2tikz is a Python tool for converting matplotlib figures into PGFPlots (TikZ) figures like for native inclusion into LaTeX documents. The output of matplotlib2tikz is in PGFPlots, a LaTeX library that sits on top of TikZ and describes graphs in terms of axes, data etc. Consequently, the output of matplotlib2tikz retains more information, can be more easily understood, and is more easily editable than raw TikZ output.</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="github">nschloe/matplotlib2tikz</remote-id>
|
||||
<remote-id type="pypi">matplotlib2tikz</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -1,2 +1,2 @@
|
||||
DIST nbdime-0.1.0.tar.gz 3849944 SHA256 5af53ccf5b265546e61fbc096c4dd8122855b2aa02f8b60a99eeee01a8e33043 SHA512 e110e2e3e8b9bfbaafd26e6558ec863eb0a23f3b7a67482e497c4883fa2151ae058582b975aca90392bd2314f5e32ce3e7316db9c2c37e44c336a9fcf88176c8 WHIRLPOOL 074060d867b259b461514e84b21c0f7eb20ff2f787055e03971fd18d0aa1ba56596b15017354c5becd3f1022b5557ec740d4815d4f820af8b54349273ee8b9a4
|
||||
DIST nbdime-0.1.2.tar.gz 3864624 SHA256 4adb8ff052a7c778fb5f00872172a3790504de392eb7f23b6ae96b8a8165a695 SHA512 9f704645ef1e64b0da260841769068db6f6aba37f30b3c6506a1876af1276acb452ed78f66b9e6d7029f06ed9fabf01a1484b4b86055f27a451d623a7eda90cf WHIRLPOOL 570891b1f9067abe88009f7160f509f8cba6345742df3d0549a486b8669f84c097487d25855f76ddea3ee8d786131145467ea20bedf3d54bca30a137977b7978
|
||||
DIST nbdime-0.2.0.tar.gz 4139079 SHA256 0915df792ab82fe8c3d3c892123bae0d5fb0180bafa150e2fe4dd327ff7e3c82 SHA512 c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d WHIRLPOOL 0a95351be0efe993ffee5f677b62488deade3895400350c04f4743eae4bbb4e113f6fc2295ef777ecabdc9c3e27023c1d6dec4b83dc48c119ca95ea2417f9319
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
DIST prompt_toolkit-1.0.0.tar.gz 212138 SHA256 5108ed9e6e40d28cb1dc90ba563987859231289700d0def999007b08f4f74ea4 SHA512 84908871df84d82b0fd0e31c1bef63b3dde38d8e3c1459d3d5466cfda68ef48477eba5a2d4c5af831e7a3fa42ab57c56f771f8050b53223638683cee27281647 WHIRLPOOL a141f2ed1bc57ef9b663877094c9fe3e4a751a59f72c327da479872bfdd48b7b70ba78f3d4be2c397acb699d2adf272a8df5c8db7b3999b2711dd1b62d4a3d0d
|
||||
DIST prompt_toolkit-1.0.13.tar.gz 240895 SHA256 33d68ca09f76cd73287fde7df5748ffacf26a8238dd61ee81ac50860ea7c6776 SHA512 9018133a7cf20c40b85d78a1622ad63a12b32994d054c7b8a593502929b6f01138d407e25f2de549a44a5d5091074e440960bc230c357806ef1507f19e15b1dd WHIRLPOOL 9121b44db7300d489821555f0bef2effb472e059b2980c0705f4006fa8d112114832e59fb7ef6f1ff6e9b442c39a7b03f05a4de908b61e52e94df4f0166f438b
|
||||
DIST prompt_toolkit-1.0.3.tar.gz 221875 SHA256 805e026f0cbad27467e93f9dd3e3777718d401a62788c1e84ca038e967ad8ba2 SHA512 c7615c42c7923bb2cefb8db536405976975d25a7df110698e9664f205d3428b6bbf6ca2aba8b0d85957296fcac0bf65752d025cabdb25c80f149f9b92c0c445d WHIRLPOOL 61390865c3f6ad7ed258c481484b6da9211c6053761ed3716977f43b00697c79e3f24443ee4695c1a4d1aea2105e2cf171df92685d42be62ac508c4f3deeb9f1
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Building powerful interactive command lines in Python"
|
||||
HOMEPAGE="https://pypi.python.org/pypi/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="BSD"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
|
||||
dev-python/wcwidth[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? ( dev-python/pytest[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
python_test() {
|
||||
py.test || die
|
||||
}
|
||||
@ -0,0 +1,86 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby21 ruby22"
|
||||
|
||||
inherit cmake-utils multilib ruby-ng
|
||||
|
||||
DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
|
||||
HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
|
||||
SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${S}/all/${P}"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="debug test"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
|
||||
|
||||
BDEPEND="
|
||||
>=sys-devel/gcc-4.8:*
|
||||
>=dev-libs/boost-1.54[nls]
|
||||
>=dev-libs/leatherman-0.9.3
|
||||
>=dev-cpp/yaml-cpp-0.5.1
|
||||
dev-cpp/cpp-hocon"
|
||||
CDEPEND="
|
||||
dev-libs/openssl:*
|
||||
sys-apps/util-linux
|
||||
app-emulation/virt-what
|
||||
net-misc/curl
|
||||
!<app-admin/puppet-4.0.0"
|
||||
|
||||
RDEPEND="${CDEPEND}"
|
||||
DEPEND="${BDEPEND}
|
||||
${CDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
# Remove the code that installs facter.rb to the wrong directory.
|
||||
sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
|
||||
sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
|
||||
# make it support multilib
|
||||
sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
|
||||
sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
|
||||
# patches
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_VERBOSE_MAKEFILE=ON
|
||||
-DCMAKE_BUILD_TYPE=None
|
||||
-DCMAKE_INSTALL_PREFIX=/usr
|
||||
-DCMAKE_INSTALL_SYSCONFDIR=/etc
|
||||
-DCMAKE_INSTALL_LOCALSTATEDIR=/var
|
||||
-DUSE_JRUBY_SUPPORT=FALSE
|
||||
-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
|
||||
)
|
||||
if use debug; then
|
||||
mycmakeargs+=(
|
||||
-DCMAKE_BUILD_TYPE=Debug
|
||||
)
|
||||
fi
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake-utils_src_compile
|
||||
}
|
||||
|
||||
each_ruby_install() {
|
||||
doruby "${BUILD_DIR}"/lib/facter.rb
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cmake-utils_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
ruby-ng_src_install
|
||||
if [[ $(get_libdir) == lib64 ]]; then
|
||||
dodir /usr/lib64
|
||||
mv "${D}/usr/lib/"* "${D}/usr/lib64/"
|
||||
rmdir "${D}/usr/lib"
|
||||
fi
|
||||
doenvd "${FILESDIR}"/00facterdir
|
||||
}
|
||||
@ -1 +1 @@
|
||||
DIST akonadi-calendar-16.12.2.tar.xz 115212 SHA256 d3b0a74ce99d6251607108b736ced91d4f31397f49517de587aa508160e5d3e1 SHA512 997c48e7c8b94119a9411e2eef1ea542d402e4b6d108cbaa9a27f6c6df72fc28d12d6f7ebba0351eb9bfdc11f33517e062ae02ac15bc476245c33cdc12c618a8 WHIRLPOOL 7ab75242eb95ceb1ce431b29ab2f834165b9ae2185646ec0c6719c908ecf91fa98f48d800d7232d0849a7d097f539ca1b3c743d7b39c4331a8f3e9150589f28e
|
||||
DIST akonadi-calendar-16.12.3.tar.xz 115216 SHA256 0f147a81bd40b3e8b847863b2848b516efdf2dcf5642c49f62ae9c8e9419664f SHA512 dfc10af89a7d3895fc7155e2acc45404826e37416baf113d43631251f285b41b0622daae99731402e0f03023aa1be6299348a7bca715f2d8d374bf070d65351c WHIRLPOOL 5ccc017dad8390016c15cf0e5d43cb3c6fbbf40202aef56144591abb80de0f820403baeac9d68756421cb0b4999d55144ebd55b89d770467230efae93e50c91f
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST akonadi-contacts-16.12.2.tar.xz 149284 SHA256 f7dd0c0495257b9670534dab0e5174c85b11e38b889aec284e18f6a93e0eadc7 SHA512 0345aa728b6718025fb0ecac73a2bf8f21936c185c041e6b542e08d9fb5393880c938d4d434e3fda39d25baaed4efdee020464b073a36a3fa766ebd471b8fc5b WHIRLPOOL d5d2ab167d9176c048df0668b1d8004b5881da918b2cb330a90e8073a56f0f31d85fd77cd86ef343d67f039aac0156aa7e4d6fb074ca124b91187b59b8ff6bf1
|
||||
DIST akonadi-contacts-16.12.3.tar.xz 149268 SHA256 54345dc2dfbafce76533a2b461fe11a7a266406516d6cc359202fc5c3e790588 SHA512 752674655df328a2e083fc475655e38e9a4fee7a0a78c44c08d62628a39a831c5be3cd3c63971959dc3000947bd4eafc0fd73a497682b3544c611a2c2f56948f WHIRLPOOL 70a9aac22d911192270d5582eb2265b8c04ee9a6c308859efe6c3ce3e6827d58508fa75fe8ed96a718010ed9ca4981cfe64252985120a59685e20c119218cc5b
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST akonadi-import-wizard-16.12.2.tar.xz 240344 SHA256 d8e28b14ee80fdabfe37931e5cc0673240607a0f77292f9ce81853409166b575 SHA512 15677d9f114818049f4246dfb1d430a155d40fbea56745753b74645419cfcadf35a840918901608cd94c3ec252d37c2721a96cfff4fa45cccf35cbb9a19013de WHIRLPOOL 64efba28dcf4b17cef6f42c93aaea25a7e4e262c80f4ee583e42b93ea9e8d003f720cd5e3a54aa8a802da359ff3209a89632e33eb5b3300aa3232f9cc6866a3c
|
||||
DIST akonadi-import-wizard-16.12.3.tar.xz 240384 SHA256 d8e518ae7876d46b5af0ad430b018c05aaf320cf4c05e1cce9a2c25b198ed736 SHA512 84c73164af8a58dda2792e15493d58b4de81c2851142f6dda4bd254d6c0e7f9b1c7029525bf1267486959abaabb555d891b2b46a4afad1d9b8bc8f97cbe9bf42 WHIRLPOOL 7c592f513e7c3280b9add21cee8b304b2e5b7f139a563fd70f6e9397ba7777625bdebc596f44ca103512e588abe4da1fd89a11beb11025e1b8d3276c8bd2a764
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST akonadi-mime-16.12.2.tar.xz 55576 SHA256 1ab495e824a3681e69efe1295c014613b6f61a5acb4f900a359185b9e9d50871 SHA512 1646605817c406c581a9c2a0960baf6f0010dfcdc4ef44e39c2457667ae44cf0e81bb9e4bc879322240ea6ad38a282d3db3fa3e0f04f403ce7e8b205d03dc689 WHIRLPOOL 1b7dbc225ae9a0f314194d4610f8c2a1763f1c652dfbf6331d451b39afcb207920790920348ea26faf5f3c73e2a9ecc2502609efbb591e36c7c1bb8af0e9037e
|
||||
DIST akonadi-mime-16.12.3.tar.xz 55584 SHA256 073cd60dc5e535d69dedf98efababaad57cb455a929b322e4d0eb6e7691e5ef5 SHA512 17e86f5854fd8355a8bb7698532aaba8a67a7b67e4cc33b8dc5d707930ef2ae286318b2e8b1545db129972947e7d5165c421b9b1247bd52353680e4ee5d582a7 WHIRLPOOL 3a5f111bf80e8059fb7141b982e5fc7000484a12dd2e998d588f40d21c3b0efc9d4a29a81751ac6d4442929a221bacab3bac8465b2af5ecbef6620a0bfff9bd1
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST akonadi-notes-16.12.2.tar.xz 19328 SHA256 74aead6ae815bb63dbea3214b9889720a2039168b771577c043de36db6262da0 SHA512 9fb532940d943d5f1ebe26a655d6d856d87b2166b16e8aa30500902e2207ae14f8bda40a45f5434e55030b0baeacb8d04110e05bc4016892b235b171f9f5902b WHIRLPOOL acd81c74984821881b29b32ddb3ae28791995ec294e359f5078f0e394a211ecdb78782ab406b180cd32857c473e2aafa687168c6db01859b66a1bb1d8b139d89
|
||||
DIST akonadi-notes-16.12.3.tar.xz 19328 SHA256 278f9517d2640b99fd86dd5817ea15baea177adbccf3fd28a338c59cfeb40510 SHA512 0ff10a467586e65ae809451fe40b4dfabcc429ef80247c4e9d1b00ff7c72f17fd2ae64ef545aeeba641f788041256a4758955da35456e0fef7e0bc3e2b4f0169 WHIRLPOOL 95c928ce6e7c47d1cb82adaf0c299a99c84fd4556acbdc09abd09cc5e12176fb3cf016b9efafe62356d95662c629c53f596e1a1a7e402bd3411c3d393faa14ab
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST akonadi-search-16.12.2.tar.xz 72308 SHA256 e50638693a0bb699c6386ae0f71037d259f3e294ae049f9eb3bdb342acbcccc9 SHA512 12413071477c4d7b3be90b9059a4250c44a2739fadb3bad9991e3cb7f70aeefad73957928d73d238a01aa05ea696fcdaaf037823e419742c74dc5fd5390549bb WHIRLPOOL f3ab08534ca46294043e92121b5fd63d910b2f9692fe47fb777d1b0aa752f9aa37f0804d64472f9708f340410a25ce9eb36bf122b7579fe3a4eb8c8d13bb42a1
|
||||
DIST akonadi-search-16.12.3.tar.xz 72300 SHA256 f71f2c781f7916148a5e843b59e4157a4e978ef8fed0fe0d8fe190ef6a16c271 SHA512 17152163ae538b85bda9f59fae1e3a04849a345ce01c95bc5f18bc0bbd21e27ec81380c93569d72542171a4f2cab38d540c3e00ff58a8166891e87b5ac637862 WHIRLPOOL b3c0fbd32d8899bf125ad989995a69d0f526f6ef610e66f168ac1ece8a4757cc56d6faaeb78c025402d1903f3c01f4e746d342cf01a4b09edfabee0bb9400388
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST akonadi-1.13.1_pre20160203.tar.gz 384556 SHA256 4243b32e529be6aadc38dc4463cb6e7cede9442c05cfc04ba679dde28f37aa96 SHA512 0ef8213f504ad1e500a2c1ce19a7575cd1fd8b7ffc7e5fb0bd2437639d8c458c47bbfea7734fcd3e200136a661331dde32af0b064f0b25d324138ce6e35d15f3 WHIRLPOOL 69eff1889a19f8d5714d7e71a106871172cd25c651ea30046ab81270cf7e46c7a1983cf20fd8d5fd8ad243d70e881be705d57b0b93b54248d086e7b253a4873a
|
||||
DIST akonadi-16.12.2.tar.xz 1036664 SHA256 bf40309f36bea813341187f72d55546eeabe0538657ea9a665a3156393514ab3 SHA512 b5ae74bc47a3bf375b1c4d3b77a4e563d82409d32aca71da798bc021e81304b73a733095a8379d87765baec8190a73f45c29d2a9442a41e8faace95b6fb49cee WHIRLPOOL 60f1b32a84f874f61aaa4a19f1fd14884b63d103985ae5b8d809a42b64eae8e30b2f625e82c7788e001211fa5235aa1b1be1f86a7003a918b11553a75d9fe038
|
||||
DIST akonadi-16.12.3.tar.xz 1037568 SHA256 fc48a200c27331d5a9ac6bfb8d7d61f3c4240f133bb23c996c78493f24644b03 SHA512 b1e02f80d11aa6f6d116bfbd963dee952ad03acbdf451b3cd0f8ca4d0037cea9afcd3723b7743bf5beeeb8d0db865094c0178be82e1a74deddaa45834f57c77f WHIRLPOOL b14b453ebfee66d4bb3ab6806406765c74e6f0edd5b4d40346c038d29330afa2efbcb8794564c9a0bce0e693ec04ab540580467411ae869b3c30263d6ed69f7e
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
commit 2fe8bf8b73b9f5f5d19c87099b71a71f2595e70f
|
||||
Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
|
||||
Date: Sat Feb 11 21:29:05 2017 +0100
|
||||
|
||||
Build akonadixml unconditionally
|
||||
|
||||
It makes more sense now that akonadiconsole depends on it.
|
||||
|
||||
REVIEW: 129941
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 4141947..4e79dc0 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -16,6 +16,4 @@ add_subdirectory(core)
|
||||
add_subdirectory(agentbase)
|
||||
add_subdirectory(widgets)
|
||||
add_subdirectory(selftest)
|
||||
-if(BUILD_TOOLS)
|
||||
- add_subdirectory(xml)
|
||||
-endif()
|
||||
+add_subdirectory(xml)
|
||||
@ -1,2 +1,2 @@
|
||||
DIST akonadiconsole-16.12.2.tar.xz 177332 SHA256 ebbffc4671c87278a790a3d7f09e1a9f1b354257c7178bf0861d34c3a85818a1 SHA512 7ec7fe13a70e4ed0349770aaa6c56413e6a759a6b4770614f4f8887277e62f28eef3bebc2bc724ff8caaec3fce2655b0fa1cc6fd1a6f406f4af025ad2f30154c WHIRLPOOL 066dfca0847f39d35be1f6ed3d22a704889fdf5a7f177361b2cdbfd90056aa594908b78c5990428025b02032b6713f11846069ccb65dffbdb4f486fedef81524
|
||||
DIST akonadiconsole-16.12.3.tar.xz 177312 SHA256 63339a45b85c6f7fd87f8a67da16bd9e070a562fe4a962cc6bbe78108cadaaa4 SHA512 e4cbadafd67744aefe40a7bed359390a285bbbed9cf3569114acf74c12d6b0337517fe7f01497ea878dd84c35e55e40f17b644825edc2196d5ced065d3cde8f1 WHIRLPOOL 7da1480ea8e865a35d048902b982f0a54baadb2f378343aafe9941bcec32a1d6ef125913a10edc9a960d216a3d8259a63918e9078f0c82c0c061a192e54bcb77
|
||||
DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST akregator-16.12.2.tar.xz 885672 SHA256 34a6efc88eec481e2609be2832ba2af50451ad046e9b0acc8dc04b350dbdd27b SHA512 46796d1b5e50f8a95ae73e53b76fdb6b317143a380ad0c55d96b7f3aa622c75f8bb35ec284da72bdb436061eef97e3e4c098ad375ce38345a97ff683f0e46162 WHIRLPOOL 64908e532d17b66bf0b1da8f0b9433e0a5668177df9681bd7313d5f14f68de12cf24e2b645d2c131e33267fba13c3beb7590efa9b65b222d2cfdba6345a2d85c
|
||||
DIST akregator-16.12.3.tar.xz 885632 SHA256 488474dea3edce1c83e70e3440666d009c40390e7ee7edf893991b05cb78d2ec SHA512 bbe65e28abbeadc353b8b3db2aa4aa28925d1da12129396fff62b7d866f26bae386a282aed598db1f17e76f8abb86748ffc2c7a62929074218e745f46520a604 WHIRLPOOL baaf6be56284697fbf80e2a2798fc09f03b024b5e016b3f9d7e0d4400870cf679d7cd668cbd0de9c9638f7cc6092bb03d63c02beff3f5716cf991a2200fa26bb
|
||||
DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
|
||||
DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST analitza-16.08.3.tar.xz 234560 SHA256 f8f85904e42472171fc6590f91afcd56f17bf9532e529c03d7181962be192361 SHA512 38ff46f027bc3f19038977c7ef168baf443a37d7d7c02f2c22e48f488bc93bae8381f2bdff2bb0bd009e4ea2c34a4c79dc24f7b4beb8d62f2d2d73f1e46ba050 WHIRLPOOL cb8bf71776fe4f93696bd75d6ccde821217806cbd727a6cfaca9aa0c08b712f36bb130c2e5a5109f0b51b86797dde4fb4d4dfc76f72576d46ba10cb1589ac9d3
|
||||
DIST analitza-16.12.2.tar.xz 234200 SHA256 1ef6a21d83f7a305d5bbab02a959c6d231811d575b66fe29feee5e2b143831ca SHA512 b049a1f148b347a34228db965f9fd7b3bb7d723a24a93f75da11cf8e50a5ae476c965184171da4ecf5d013264947cffb931508d15e458344d29d64b5f1600e2b WHIRLPOOL 56730721a2aff6113143d46b0226ebb86da498e9e174dd9ac48a6b1fe2714ec548feaeaa85936cece4e274893ab4114ab2ba85053ca5bc63ce8ce92c898d300b
|
||||
DIST analitza-16.12.3.tar.xz 234200 SHA256 bc186173402fdc497a307be87f08638cb4ab80e1c6ffc1ff45c525be90d3e32a SHA512 fc5cfdfde841051be6b9014db7f790082d9ccf067e89629a7a0c2877254e3a466495e17f8ba638b9c794897e467198b8f753f03b941c932d617b7abefd25aaca WHIRLPOOL ef2a3d8877d02f1aeac5d54e335c1002f46452c5faa76120516f544f3c3ba9c164f500329c904bf2f0b7d3fe48753b40dfec7e4e79d075b83afaa1f0403bc17c
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST ark-16.08.3.tar.xz 1293460 SHA256 c713f6afe0784229796e14ef6e67a1afb5f276a97651bd2a973eff22f8932c08 SHA512 80cecfce8ff417c68f3d0a4e0bf2467d7345fc9d90c4f8b93bb66b09624ea40283aa6f84bd75843d9fe92b6fdbb018117feec5835fa87aca0f21b3e8a02b8abd WHIRLPOOL 9f80598d2a087fc16b023bdf55210114513b0f7c2a446b96f158533a9ca73f2c335fa20d2ada5d6569a860cc6b1625476b5016df5fa9622d4d9395d36f79f0a2
|
||||
DIST ark-16.12.2.tar.xz 1348476 SHA256 23d346f331de8d3bce14ce073244f79f99321bf59c037e3a229d398b6511571e SHA512 c4cb7c8e89e75cefe99eeaa495b4d0ec8c9082cf34f768cdbe9f268c511d71f4d8173141b7999077b232e74181402f726f37cdabfe31b2fce22b7457c5faf535 WHIRLPOOL e43f0543cc809b67f2cc17cf3c7fead040352c0e9537e43e528c4ab9dcbe3b5d7c8dc609929d10299fec29fd21636ffd37a408d3940d27eb541c86771fad5dd3
|
||||
DIST ark-16.12.3.tar.xz 1348616 SHA256 a0e54892a809d9b805aab95d33060560480a5575df2e8afbd6fc0eb074ee2b60 SHA512 2bb7c80758bc0a3322892b66cbe26dad199661e1bbbf71fb0ccc2bc1bea8dac8f267fc371baf55a4674e5bc67f86fb39587709d12e10e53988fa1a6c0e056956 WHIRLPOOL 35cd9f15f7a04b99b09fce32c6ce3819ed7b7c6e0d2240517ccf942a15622f0f10a19c758c5195c44ba9c5e4a451673073c0cedaad12d9970618867bf17d3126
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST artikulate-16.08.3.tar.xz 3651452 SHA256 a16dffa2d60b6d880041ccd494934a04c2d2cd0f4ae2c698fed95ee99950be3c SHA512 102ed67fa073e22d0fb8e546351791775001800121db5afbef6762c04a912814bcc530d92b7eac0f2a9689476a965741e2a44a3b7c148f0e2394f3f8aad16b14 WHIRLPOOL 96e7506fda0c40a4f714fc2d9cf35809e8c45fd6db64245ae538b75cd564eae501e08657b0cd1f9afd1b4866ca15454da84e2bf8874f5b145bcf129b3d6a4db6
|
||||
DIST artikulate-16.12.2.tar.xz 3652972 SHA256 85f18e0e01ca3024ccb61c5b7fe06db0a739c65f5bd6bff3c181b557e82f0684 SHA512 8e777257723ce42687555d8bd217e3b2798c8b999dd55e873bca2769aa2f07f0fa736f0393c629258efb80483edd429e0495076bc737fa2b7eacc61226ee3294 WHIRLPOOL 2a5a804a6c25d0b902f049cfddd893a94684b008873ece03483f5afdbab7e60851ca7e5d5673346fadf3e66131aa9cea42855a1795c40df7b9c7fa0f33bc99b2
|
||||
DIST artikulate-16.12.3.tar.xz 3652980 SHA256 fa24da78a4c34b14f01fae73f4d233ca4577a6b1c93e54840c26c7ec01337384 SHA512 a948ffba48ee7c902d5c1d7a73ee38efd727896fb25c5bade13c9223a34dd193ac9e4b49f2e570814eea48d8e8cb7a3ecf2ff01303e1779fedee4436f0f219ec WHIRLPOOL 3d0be12e551f9487e8596b12e8620fc67320b003f465e349c1d1c2663f979818c98785adaca64584073a2206c437c80b88846180b85167b417444b1c00f13295
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST audiocd-kio-16.08.3.tar.xz 52068 SHA256 78988ef13f4228d94923d50dc54129a91d034ffcf014029dbc39bdb0cdedf8b4 SHA512 7eb3655a381c3f8de8c5f6267dcae10884ca65e58314735e2bc5604fd5547ddd6b65e6e93d1921bc1ca43f8b1c09fbfc01366d6dd33bc10056fec3178a0469ba WHIRLPOOL 7515e5b1429ac843b66b0d8a50b464c9f3da4138ecf6b8a33c7ae2c268779a94d159f62d462039f5088fe9f221bc82dc0060e9c64ee8c015dcf46b33cfdefb55
|
||||
DIST audiocd-kio-16.12.2.tar.xz 53600 SHA256 eaf5434602455afb00b026e3c1241a092edb96e96c9aa999d3695f6703ce8fa0 SHA512 575828d514fdbf77464fd26cca44c56ee4f016569eb259f5c0a46a6225bac80e0d82064fdb828bc23e296b38945f564d8e9b76129014b113b113c4d9e20c17fa WHIRLPOOL 35bdbb4bd1cc72a9c1919f11885e9f01d47be671b54ec1d5921500005c5b013bb921c2afac4bd6828ebd6370fdc4e02e79c0aa4cf5fb91326e9096fd3511c41e
|
||||
DIST audiocd-kio-16.12.3.tar.xz 53604 SHA256 3e744b6fa67a7058ad37a0420d188d2ab0ab9b18924786b4b6c88cdeb388b52e SHA512 34b646b19c6ac3fc6286af4bbdab274b3c07e2af912edcc01591cb1b10f32d8c098a671debc56eb1bf7e88aefc70b60206195f428d33f7468b0720760198cf24 WHIRLPOOL e9405c38f7cb37e853dc181d09d87e54e5e9d0e1af389ddb131fee67938b1fe4f8788f72d9fa5ee398d6862d507c0c1b1843fdb5f64fe9cc778a59b01da012f8
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST baloo-widgets-16.08.3.tar.xz 57056 SHA256 75448e26811b098f93dcb936d5f76c94d30fde618a7ac9661008db7d9d04f513 SHA512 e4d898cbfdecb0545e5a10ff611c433c20f1bc91b8c95fd3c7b636d33dd40e9ace2b5d8c3c21dcc6b686a54b4ef1758eb6446fac710492d3d27f6a3f81425d99 WHIRLPOOL e19a637c52132287cffb2597846bc7275dd6e849be25827245aaf7d855240caeee77bca4b8122a4d8995f31eb51880f413d5cc785f7026052e9306ed08146e13
|
||||
DIST baloo-widgets-16.12.2.tar.xz 57204 SHA256 9d8c7c8d842700f633156e0662554bb0b6f241d4a62087fb6a1a1b39862e1b00 SHA512 01122e79c6cd1df0a11bf2db3762e071b9a7a2b863ac9335688ebafb643cfcb50a88a527caf6959cc01c9f56b8a426491ef7156a07a134b91f7e2e0faaba41ff WHIRLPOOL 40b273e51ec1fc331199442db7fa29dc4cba3c75bc16844d61fdd92d74c85d78dc5ac1f46d9b736efa935abf8a7c3744ae6ca7644c06f0f5815b3a9652e4d938
|
||||
DIST baloo-widgets-16.12.3.tar.xz 57172 SHA256 74bf67fd510fa4c8e6d682356be7417728caef4b7cc6349b8bd2531f1bfce540 SHA512 15c8a1c433715d4ff3cd0bfb9b2ebde606e36c8a051dadd760f6dc710022dcf7ef2b5b3f375258ceb713b5ee06b3550cc5d267f7aefcd785a5e6b0566d5d5223 WHIRLPOOL 6b2d6d7f74595b1da6c4c733ad584a6153919208f07c2b5ccb880249da2ab05655f142e7652f4611f9f50ab9d15fbeb434387660293c26a5ae2dd096fa770c99
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST blinken-16.08.3.tar.xz 562784 SHA256 1b1ac60134f48abb959572546f780bc7fc46c71cd4410ec78ac3c1760ed2e164 SHA512 a094b8397fb343af7a32583f3ff5e23795e7ae8fb5951516002093e98769407f9c23259cdd95c64d6cb7165722354d3ccbe9fe8be0564000cf0d968a1ae1464d WHIRLPOOL 331b957d294ea6b7b4a4da2a8099fbcc393df53dd8f0f4270414b7c80848333f2c7b34b0f79cff4d7c8679f67c9195dfa7bb5d85f8429fff94237d2321ffbde0
|
||||
DIST blinken-16.12.2.tar.xz 562776 SHA256 dd9cc57d4782810fb67b5f0293f07097abe026be0c660fd366e43c9e524094f1 SHA512 a36b3b88191053ed67ff364926273bc1e9fa19b2f9fa949b01e4d966e92547a2c3dba1f238083557329e965030bcfcf9d4a97b6ca5f6132bf757e1e50ce83bb0 WHIRLPOOL 1803b328eb8aca1b2bba4a2594b5f2e64e043775c5201690b9eea92a757d92a44fb77c52d16b1d80898360f1218abe19b75ecf84ee9b8a48930693ed160d2064
|
||||
DIST blinken-16.12.3.tar.xz 562784 SHA256 eab1d6eb7378ecee95784311cf75552cd8956783f62062374901e2182653a0fc SHA512 7d4b7e9b47308d515a708b0847e383db542e53d966c1e09fee9883d094ecb0b7114a831188c69b16a5c83da81a5fea1967a6ede6675b028440b85cf2ad5641ff WHIRLPOOL 169a7aa404d6d132581186ff58e55dccf544b326b6e18f78a48e5bf814aeea49c8a79806e3db95bc269990d50a090a5ef19e41630ab52b7f9323c00df6639680
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST blogilo-16.12.2.tar.xz 331284 SHA256 09305bb964f56a0fa8b759078a9724dec8dcdfb0471344537a2037eb2cfab548 SHA512 1c6cec81dd245432dfe30bfcaccfbb19039f8cd8cb4bb34af185121b42581f1710cd53fbb03dd700434ab2b3396ac679a255e3db85a0bb67ac794d2c7ac43c5a WHIRLPOOL 1caef8b466ddf31685dce33072d7cb64b4604e4482d4ef6c703944cfe4d1ec32c14a67ddc9d066fc80df6e0320c5f947aff288acc88eb5e86aa20835fff8ff3e
|
||||
DIST blogilo-16.12.3.tar.xz 331264 SHA256 0e84a82b6e56dbd5733d9f60392dac35e7f3f85270deb3845c689d8eaa28d493 SHA512 14a46a98bb53a5133924751ea2e59ba43e3c7096adccbad72605916d731c22b38700f71cd1ce1eb5d04e8f72b3a60effdee19a88bf9fee2f33ddeaacd82b2df9 WHIRLPOOL 1236986115220ed0560530753052a4c1f286c81d26c858858dd3c4fd160e3416877279e606309f8feb2de4b3312690d909f1ef0439632d8d79cca49a8ca04feb
|
||||
DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
|
||||
DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST bomber-16.08.3.tar.xz 714956 SHA256 8ef027fcedcaef5caa7991999df5814786758c82a36ef8d28422f9a0cdd80db3 SHA512 64006a0abccb691fa36e7e551aac166e6e5c96fb8aaf3c925b7fa8f37715645da3189f6a28c076f137961827f728dc12b6f5cf737e005161d1a3ffe72cdf37bf WHIRLPOOL d1341393ddef52a14777d1cce8505d699f3f2061a67bbeb3f2294e8bc5abea578e3151e7fc069ad1e4a1a2f867ffa820126d1e612b185c467c4a5090e41ee2e1
|
||||
DIST bomber-16.12.2.tar.xz 715200 SHA256 0cb312a6c9c040959e56dc3c05b772e446df33d594fd7ef29a26c7fc8a3fc1bb SHA512 e1710d459ddaaef2436df835c11582a70628fac87bd317427de4d042c23af3098720203a2db7a1605ff53763f9f37a54f3631d9ee1aaba4e58e6e836ebe12274 WHIRLPOOL 40296838f17509fb94974ce03c036c34fd0a29485339a87a155dcc5a5c30c22d768cf1b26ba4f4876dc59d18b686586c9090f128a2aa3f8cd005cbf16bf166e2
|
||||
DIST bomber-16.12.3.tar.xz 715220 SHA256 81e4212601491714638ae60135fbcf2a440714090d71ccb81ff9ab2fab329ac0 SHA512 e3e60f646783fc2ac5e8958f07e2d8cb54469a2a1684e0b5a0330193787a81f7b4584ef49642f8f79ab38ee139eef8d241f54cfbbdb8c3ab5105f5e3b0f14cb5 WHIRLPOOL c8ae2f31b11a2027a0940c63e23e0459c68ba88551419dc8dd5c496ff23db71bbc09556d69b3a4448afda4431d550ccc0690ac5df7cbc31ec317614ac0a468b6
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST bovo-16.08.3.tar.xz 138860 SHA256 691a97d5e01526534b316cb888516a3163f614ba4a04a2148876b20dee91d17c SHA512 a5f77208f66147cdae850d02cf8c3ac930d7cb3fcb2fc28c3b4a7b123dfb2173c84cab3375e4b9c27b518f5c216529bfadf3fcdc2b70cbf91944cb046f792de2 WHIRLPOOL bf684fa7b6febbe141502622cba2c234d63db8d251c5611b2a431bfb904db084dbe2caf9132f3afae377071d6becfed46b3471e92f4434205d1e3d5855ec049d
|
||||
DIST bovo-16.12.2.tar.xz 139368 SHA256 f8279e1196430e41b0bc89bfde387241b3391e178683b065e9e204ac635f5f37 SHA512 817d59fef2d627d6bdfab35798f925274a74e3eab75dc34f24a7aeebcb740ed42aceb1afc66745412625d6a42611836fea1f1178a37cd87f249739907fc74924 WHIRLPOOL 378194ad6ad0b0c3e65b695745bab07b1f4ec8528307fc5ab58081002542109b23d81140bcfb1b1d6ab437d719680ec2b3edbbd22b105db8a9805e95c0f21dbc
|
||||
DIST bovo-16.12.3.tar.xz 139400 SHA256 c63b5d0c3446baa85e91a7c1b9ae9370a1f01b98a7c6b07510bcf643dc3b26df SHA512 a4f57d559cb80bd0ca64cdb95643da19b1745e070b775f3e4982a6b8b550fae78bfdc412ec45c0c57ce8e78302cb21e90d8ee17765be9499bb29bf3e4c122045 WHIRLPOOL 667a194447bff219fcacf7dd0fdd30060abcb7c2bc5d7800b4da2dc4e53e7fb2d857ce8b5179a94aeb022f8c9729388da48b9a173b57ff6ebc78839f9bee66c5
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST akonadi-calendar-tools-16.12.2.tar.xz 61940 SHA256 12020b4ba8ecd35430e4cdffa14cc976ba1ae77b867aa4c416df3aa395de52c7 SHA512 ed3905b0796584830c6fd98087c84dfaf6919c64f42b1fdbe69e0836207a217fdb5df9a6be38ad78f38d78a85826f778d03524368f7efbc90b5e40c7886f5915 WHIRLPOOL d3e247219b46062f2be88cdc4ac94c9855a3c7224593bb583a287a5834568a90c5055036be124ded52cec653985b63a0af11660faa0d19e898bedde0a4eddb33
|
||||
DIST akonadi-calendar-tools-16.12.3.tar.xz 61980 SHA256 87f47068abcd78dad54903c9c29399ef965bcce03d64beb41743de7328abf394 SHA512 2bce7a50a1ca13641752a191d43379444115c874d6ab852b83eaa5ea0e5ee7c357640755685f7175f98a5dcdb1bc04c08e3e224970c70f3dd324458920ea6d63 WHIRLPOOL 5693b938e8e13f60c06010ee920167a616105648ece8e63041aba24d08cf2a577bb1937fed7cb67ee946f46905f75c12c6018eb54667d99cfd84b755f409a095
|
||||
DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST calendarsupport-16.12.2.tar.xz 100392 SHA256 4b0b6a866f179f5efd6b4fc57d3b9c3fa407f8649892f128c95040836702b018 SHA512 584a5b99db0dbc9a0b6ea71073983599577cffdffa475836d83729e78adcbf4886cc8ba00aea336c6d29754d39a77c7586c0d95b44c7273c850381d70e7d78b6 WHIRLPOOL e7fd3d153cbad787152e80cded5cf7af8594fbd987fa6e83d0714b0a949d6ad1c3ba273ceee760c0e9d15c3acb9457879e949d56a9a747afdb49166476cd880c
|
||||
DIST calendarsupport-16.12.3.tar.xz 100400 SHA256 c0a356ca87e114215555462f84d21348dee29dde91028ff4a94757ffb9f86064 SHA512 55277604b5d839ff01108dde8c4696fa3f5cd29d341a4523bce6759af9580fbea78990b6c29528c372ae645e570c97c1f4fd332a693ec3866bc3afde920e96ee WHIRLPOOL 397f5bca7230bea783d6c3f748139da1d345f80c90ea77c61b2962c631b479375d1bb1eb3d4c6169cc5747f42a3c93b93ee515218deb5280db83615ea37b4226
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST cantor-16.08.3.tar.xz 361368 SHA256 c702f5f94b68bc18414c3f193b93f431cb2063da9ce41c089478b77337695a44 SHA512 46ef9494ccc94bb849b551fa7b9e5a8bb43263ac5a5170d699ec9cfbace66ec56318ffa1b4c939cdb1e7887d5b6b8061a9361e6171a8decd7deb4079c45511d2 WHIRLPOOL fc11c8ed444fd2c61f49c54cd389fc640c14d43c91e6cd0e3ca89f81a4cff82ea4429b9428a6c92110f4111ff261c4b09faab4c311e8b8835ef7a3a955838350
|
||||
DIST cantor-16.12.2.tar.xz 378512 SHA256 a49b38ac9d50de7389a1d88159dc25866fe2e5aaf3e9dca2bdb18a2ea8efba14 SHA512 c5594f037665d9ef9b62fea225160fb5467a235ecd44cd69992620ff79972deb186c7b8cf736ce9576844986a2094f00a97add5d45ffde89a6355f23181bd19d WHIRLPOOL 0b63207dfbcf6fcf5d3e80a462693c46f1be6249e5a1e00afe25cc641d8d82a4a21af257494c9811361deb62516acf3a1e81a31e45294a9ea17581d91cd02dac
|
||||
DIST cantor-16.12.3.tar.xz 378460 SHA256 888677129bf30474a2f2bfe46931770f411cf8823c944e90ba4ea16d9d4eefdb SHA512 e6401d5472797894931b4c1c0a4cda7e900ede0d9c5e7d1b5a2ff518741f7f62a7f6187b5081edb231f47c1de163aa537cc195e381334ed60890eb6c73374768 WHIRLPOOL d0dbd031450ed730fdcb382a6aba778e0b9928ada3fe7c144012e95a521d53f1c13fe34bbbc6d2339e10cdf60f464327f9583e1bbbd10c1ecc6f2f43d308df33
|
||||
|
||||
@ -1,190 +0,0 @@
|
||||
From 45322d9f58f50df3d4d5755d4199e579f6fd8646 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
|
||||
Date: Sat, 11 Feb 2017 22:46:35 +0100
|
||||
Subject: [PATCH] [julia] Fix build with -fno-operator-names
|
||||
|
||||
REVIEW: 129942
|
||||
---
|
||||
src/backends/julia/juliaexpression.cpp | 6 +++---
|
||||
src/backends/julia/juliaextensions.cpp | 4 ++--
|
||||
src/backends/julia/juliahighlighter.cpp | 4 ++--
|
||||
src/backends/julia/juliakeywords.cpp | 10 +++++-----
|
||||
src/backends/julia/juliaserver/juliaserver.cpp | 4 ++--
|
||||
src/backends/julia/juliaserver/main.cpp | 4 ++--
|
||||
src/backends/julia/juliasession.cpp | 4 ++--
|
||||
7 files changed, 18 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/src/backends/julia/juliaexpression.cpp b/src/backends/julia/juliaexpression.cpp
|
||||
index 27cdd85..618200d 100644
|
||||
--- a/src/backends/julia/juliaexpression.cpp
|
||||
+++ b/src/backends/julia/juliaexpression.cpp
|
||||
@@ -40,7 +40,7 @@ void JuliaExpression::evaluate()
|
||||
|
||||
// Plots integration
|
||||
m_plot_filename.clear();
|
||||
- if (juliaSession->integratePlots() and checkPlotShowingCommands()) {
|
||||
+ if (juliaSession->integratePlots() && checkPlotShowingCommands()) {
|
||||
// Simply add plot saving command to the end of execution
|
||||
QStringList inlinePlotFormats;
|
||||
inlinePlotFormats << QLatin1String("svg");
|
||||
@@ -73,8 +73,8 @@ void JuliaExpression::finalize()
|
||||
setResult(new Cantor::TextResult(juliaSession->getOutput()));
|
||||
setStatus(Cantor::Expression::Error);
|
||||
} else {
|
||||
- if (not m_plot_filename.isEmpty()
|
||||
- and QFileInfo(m_plot_filename).exists()) {
|
||||
+ if (!m_plot_filename.isEmpty()
|
||||
+ && QFileInfo(m_plot_filename).exists()) {
|
||||
// If we have plot in result, show it
|
||||
setResult(
|
||||
new Cantor::ImageResult(QUrl::fromLocalFile(m_plot_filename)));
|
||||
diff --git a/src/backends/julia/juliaextensions.cpp b/src/backends/julia/juliaextensions.cpp
|
||||
index 4585c6f..ad5e3a9 100644
|
||||
--- a/src/backends/julia/juliaextensions.cpp
|
||||
+++ b/src/backends/julia/juliaextensions.cpp
|
||||
@@ -138,7 +138,7 @@ QString JuliaPlotExtension::plotFunction2d(
|
||||
{
|
||||
auto new_left = left;
|
||||
auto new_right = right;
|
||||
- if (new_left.isEmpty() and new_right.isEmpty()) {
|
||||
+ if (new_left.isEmpty() && new_right.isEmpty()) {
|
||||
new_left = QLatin1String("-1");
|
||||
new_right = QLatin1String("1");
|
||||
} else if (new_left.isEmpty()) {
|
||||
@@ -165,7 +165,7 @@ QString JuliaPlotExtension::plotFunction3d(
|
||||
{
|
||||
|
||||
auto update_interval = [](Interval &interval) {
|
||||
- if (interval.first.isEmpty() and interval.second.isEmpty()) {
|
||||
+ if (interval.first.isEmpty() && interval.second.isEmpty()) {
|
||||
interval.first = QLatin1String("-1");
|
||||
interval.second = QLatin1String("1");
|
||||
} else if (interval.first.isEmpty()) {
|
||||
diff --git a/src/backends/julia/juliahighlighter.cpp b/src/backends/julia/juliahighlighter.cpp
|
||||
index 4795361..f7d3622 100644
|
||||
--- a/src/backends/julia/juliahighlighter.cpp
|
||||
+++ b/src/backends/julia/juliahighlighter.cpp
|
||||
@@ -98,7 +98,7 @@ void JuliaHighlighter::highlightBlock(const QString &text)
|
||||
while (pos < text.length()) {
|
||||
// Trying to close current environments
|
||||
bool triggered = false;
|
||||
- for (int i = 0; i < flags.size() and not triggered; i++) {
|
||||
+ for (int i = 0; i < flags.size() && !triggered; i++) {
|
||||
int flag = flags[i];
|
||||
QRegExp ®exp = regexps_ends[i];
|
||||
QTextCharFormat &format = formats[i];
|
||||
@@ -144,7 +144,7 @@ void JuliaHighlighter::highlightBlock(const QString &text)
|
||||
singleLineCommentStart.indexIn(text, pos);
|
||||
|
||||
if (singleLineCommentStartPos != -1
|
||||
- and singleLineCommentStartPos < minPos) {
|
||||
+ && singleLineCommentStartPos < minPos) {
|
||||
// single line comment starts earlier
|
||||
setFormat(pos, text.length() - pos, commentFormat());
|
||||
break;
|
||||
diff --git a/src/backends/julia/juliakeywords.cpp b/src/backends/julia/juliakeywords.cpp
|
||||
index f0a5846..8a0efec 100644
|
||||
--- a/src/backends/julia/juliakeywords.cpp
|
||||
+++ b/src/backends/julia/juliakeywords.cpp
|
||||
@@ -62,11 +62,11 @@ void JuliaKeywords::loadFromFile()
|
||||
const QStringRef name = xml.name();
|
||||
|
||||
if (name == QLatin1String("keywords")
|
||||
- or name == QLatin1String("variables")
|
||||
- or name == QLatin1String("plot_showing_commands")) {
|
||||
+ || name == QLatin1String("variables")
|
||||
+ || name == QLatin1String("plot_showing_commands")) {
|
||||
while (xml.readNextStartElement()) {
|
||||
Q_ASSERT(
|
||||
- xml.isStartElement() and xml.name() == QLatin1String("word")
|
||||
+ xml.isStartElement() && xml.name() == QLatin1String("word")
|
||||
);
|
||||
|
||||
const QString text = xml.readElementText();
|
||||
@@ -91,7 +91,7 @@ void JuliaKeywords::loadFromFile()
|
||||
|
||||
void JuliaKeywords::addVariable(const QString &variable)
|
||||
{
|
||||
- if (not m_variables.contains(variable)) {
|
||||
+ if (!m_variables.contains(variable)) {
|
||||
m_variables << variable;
|
||||
}
|
||||
}
|
||||
@@ -104,7 +104,7 @@ void JuliaKeywords::clearVariables()
|
||||
|
||||
void JuliaKeywords::addFunction(const QString &function)
|
||||
{
|
||||
- if (not m_functions.contains(function)) {
|
||||
+ if (!m_functions.contains(function)) {
|
||||
m_functions << function;
|
||||
}
|
||||
}
|
||||
diff --git a/src/backends/julia/juliaserver/juliaserver.cpp b/src/backends/julia/juliaserver/juliaserver.cpp
|
||||
index c9beb4c..91585cf 100644
|
||||
--- a/src/backends/julia/juliaserver/juliaserver.cpp
|
||||
+++ b/src/backends/julia/juliaserver/juliaserver.cpp
|
||||
@@ -47,7 +47,7 @@ void JuliaServer::runJuliaCommand(const QString &command)
|
||||
{
|
||||
// Redirect stdout, stderr to temprorary files
|
||||
QTemporaryFile output, error;
|
||||
- if (not output.open() or not error.open()) {
|
||||
+ if (!output.open() || !error.open()) {
|
||||
qFatal("Unable to create temprorary files for stdout/stderr");
|
||||
return;
|
||||
}
|
||||
@@ -90,7 +90,7 @@ void JuliaServer::runJuliaCommand(const QString &command)
|
||||
bool is_nothing = jl_unbox_bool(
|
||||
static_cast<jl_value_t *>(jl_call2(equality, nothing, val))
|
||||
);
|
||||
- if (not is_nothing) {
|
||||
+ if (!is_nothing) {
|
||||
jl_static_show(JL_STDOUT, val);
|
||||
}
|
||||
m_was_exception = false;
|
||||
diff --git a/src/backends/julia/juliaserver/main.cpp b/src/backends/julia/juliaserver/main.cpp
|
||||
index ad7e4d9..11687ec 100644
|
||||
--- a/src/backends/julia/juliaserver/main.cpp
|
||||
+++ b/src/backends/julia/juliaserver/main.cpp
|
||||
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
QCoreApplication app(argc, argv);
|
||||
|
||||
- if (not QDBusConnection::sessionBus().isConnected()) {
|
||||
+ if (!QDBusConnection::sessionBus().isConnected()) {
|
||||
qWarning() << "Can't connect to the D-Bus session bus.\n"
|
||||
"To start it, run: eval `dbus-launch --auto-syntax`";
|
||||
return 1;
|
||||
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
|
||||
const QString &serviceName =
|
||||
QString::fromLatin1("org.kde.Cantor.Julia-%1").arg(app.applicationPid());
|
||||
|
||||
- if (not QDBusConnection::sessionBus().registerService(serviceName)) {
|
||||
+ if (!QDBusConnection::sessionBus().registerService(serviceName)) {
|
||||
qWarning() << QDBusConnection::sessionBus().lastError().message();
|
||||
return 2;
|
||||
}
|
||||
diff --git a/src/backends/julia/juliasession.cpp b/src/backends/julia/juliasession.cpp
|
||||
index 425e6cb..9183e11 100644
|
||||
--- a/src/backends/julia/juliasession.cpp
|
||||
+++ b/src/backends/julia/juliasession.cpp
|
||||
@@ -86,7 +86,7 @@ void JuliaSession::login()
|
||||
QDBusConnection::sessionBus()
|
||||
);
|
||||
|
||||
- if (not m_interface->isValid()) {
|
||||
+ if (!m_interface->isValid()) {
|
||||
qWarning() << QDBusConnection::sessionBus().lastError().message();
|
||||
return;
|
||||
}
|
||||
@@ -213,7 +213,7 @@ bool JuliaSession::getWasException()
|
||||
{
|
||||
const QDBusReply<bool> &reply =
|
||||
m_interface->call(QLatin1String("getWasException"));
|
||||
- return reply.isValid() and reply.value();
|
||||
+ return reply.isValid() && reply.value();
|
||||
}
|
||||
|
||||
void JuliaSession::listVariables()
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
commit 4b8ef6bed62daced90c7826985650c2a813d2996
|
||||
Author: Jonathan Riddell <jr@jriddell.org>
|
||||
Date: Wed Feb 8 14:56:48 2017 +0000
|
||||
|
||||
remove modern C++ use to fix compile with current KDE policy
|
||||
|
||||
diff --git a/src/backends/python/pythonhighlighter.cpp b/src/backends/python/pythonhighlighter.cpp
|
||||
index 4064524..87b10dd 100644
|
||||
--- a/src/backends/python/pythonhighlighter.cpp
|
||||
+++ b/src/backends/python/pythonhighlighter.cpp
|
||||
@@ -87,7 +87,7 @@ void PythonHighlighter::highlightBlock(const QString &text)
|
||||
while (pos < text.length()) {
|
||||
// Trying to close current environments
|
||||
bool triggered = false;
|
||||
- for (int i = 0; i < flags.size() and not triggered; i++) {
|
||||
+ for (int i = 0; i < flags.size() && !triggered; i++) {
|
||||
int flag = flags[i];
|
||||
QRegExp ®exp = regexps[i];
|
||||
QTextCharFormat &format = formats[i];
|
||||
@@ -126,7 +126,7 @@ void PythonHighlighter::highlightBlock(const QString &text)
|
||||
singleLineCommentStart.indexIn(text, pos);
|
||||
|
||||
if (singleLineCommentStartPos != -1
|
||||
- and singleLineCommentStartPos < minPos) {
|
||||
+ && singleLineCommentStartPos < minPos) {
|
||||
setFormat(pos, text.length() - pos, commentFormat());
|
||||
break;
|
||||
} else if (minRegexp) {
|
||||
@ -1,2 +1,2 @@
|
||||
DIST cervisia-16.08.3.tar.xz 460704 SHA256 47fcf51555dd9ee7e21258d9f347c23a21ea4746d2170836d1c2caf62d92e692 SHA512 3bf8d3c8a748705dbd078c8042248347c7f85695ad73f6a5b40c6648aae1bc00e2937088c3e807acffcf50beb4d13a9a8fe4f73d933297107fb9c555c52cd947 WHIRLPOOL ec6c1a5ac0a2f2e9eff43624df72e5292100d24a395d4c0f99c2fbae611fe82178e17157f18d3b1598d36837defab5f7f8856767d94232932c70d769f955c30b
|
||||
DIST cervisia-16.12.2.tar.xz 474952 SHA256 7da96bc938af9cc14247860036c5abcd58daa40aa0e04da2bd48f1236edbb6b9 SHA512 80db741d035bb06531d0235d6be411c0dba64b0c49653549a565e1243a96bdc22b969f8de937ec87e65f3c794c2a8526f4a800c4fcdededdaf9a73cd24848fcb WHIRLPOOL f13cfdfc7a7887062d050defdf9063e547186368ec35359348f6f5f1b4606eef45371fd964c38c854bea4cfa0623c600f95d721ef868a5746db6a1340f00c4f1
|
||||
DIST cervisia-16.12.3.tar.xz 474940 SHA256 733b2ffe27b8e3057adab3eac20858a2d6ee995bbce13860882c93bf9f2d2593 SHA512 80f740e2d93d52dc86f27aac011967229141236abbd4626504d9bd6b83e6550c822b22500bf401c10f784cbd5b90f428e2d502d73a064ec1f5a3234b854ba785 WHIRLPOOL 11d32c336e353e6e2d540713024f939fc2185fc8fb82f3f35fbb5ece1b110022718fe7ab8d968d896e7c571a8351d5302e4b83f360dadc04d315069a05eeddb6
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST dolphin-plugins-16.08.3.tar.xz 60952 SHA256 9be0b1fe55fb5660a3120707616281645b7ef170d67212e34bfda2fb7ec12d17 SHA512 923007aa42559cce1f6b911b3f2d088ad0da5c2bb8fb343ed0605d4cd9dc4b9f298f5d0424eaafef07c6365c701e99407660b862ce4d0950fb31e895ad8616c0 WHIRLPOOL 894b86024724a59f8cbff868181a7fe721cbc2131b8c0bfe4d269a7d65072a570cfa205a2994ee3d7c33a09ff3fb85b5219ec4ddc1acd5a470214abc7a4b7304
|
||||
DIST dolphin-plugins-16.12.2.tar.xz 61100 SHA256 43b63456d53346f7ec377f476ecb5f62be36aae93683f75728ab01b14ae2241e SHA512 d12c48383a943d220026a87107bb80749963e5d7a64d6e061d53e56c1a89d1314b68967110ae9229648ed26b739e0f6656abac66f637cd6929f5a976029ac72a WHIRLPOOL 98753775b7d9bfff38bfbc1a24b971616cdb0d49cd85e42529b3809715647d0c09d8fba66f51d245457809f9e87d61c5c7d3da90abedf00f967f4c0c70160949
|
||||
DIST dolphin-plugins-16.12.3.tar.xz 61112 SHA256 a90bc65485adf95e230b979effda5addbf7464555551f3c957f98ec17fa55fa1 SHA512 5d276762bf6ac3e121dd6606bf6edc4079c55dd91e54ff855b32869811ffdfe68815691a78cd0d3d4fed969c02732f5535b4226f5ada0f8b6537b816e7d5569f WHIRLPOOL 7788e51134e9f73aa23f4d32e38373a410792b640b9ce78b2e0cc050f45519747cf29669ad2862774036f1bd78121bc00e60b2104c6fbae8b25df1f2388870c1
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST dolphin-16.08.3.tar.xz 675756 SHA256 fdc918b8473db8752b21173ba23d874ec17a469e8d70d17d2aec68035a391b7f SHA512 6ec5d8ef0f7b95cc3b1b5f1621a8ebf66c8859bc6fe1424b62e8c7b34fcf9af44f4372555ed3f668bcfc3f9f0c060f18a4f84e8a239093f9928f3679f00a6d1a WHIRLPOOL 2f1942d0efa408b4847de570b386d565e35c1f71d6be341d0035fb97a668a47bdaa9c111c080e98cfb6e1335437662d423989a28ddf366ee951599b7a6e48042
|
||||
DIST dolphin-16.12.2.tar.xz 676232 SHA256 c657a80e241a341e85b28c30d064153df319319cee345dc7cc997576e1cc13f7 SHA512 dbb503051b4843ae039d84334986472e2b96f4ac31839338ab629fac5bdfd0e1c7eed57c02bc0014fd71f8cd2a248a74324c8103eda4323a9fee5b0fbec371ac WHIRLPOOL 2be3410cfb0ddfece070d6ea47d6dab6ede9c178c223a935a7427001f28746f628557fe8fab93dd971d3d67d1964aaa7bb2261f0675bbe312cec5dc742813154
|
||||
DIST dolphin-16.12.3.tar.xz 676192 SHA256 62f1392a25692bc7ff0ffba89b1949beba3cba0f78bdf6acdf97ac2897a46578 SHA512 99a6f35678918dffa7a55b453705186a92bf1b69776a7b80ef12553489e258f5776a5d7b2a5dd16cbdb2e6772a2a122fe10e74afb6233e7a939f8f925e1d8736 WHIRLPOOL e606fbb6567f0c67e952ac91e9e54fcb7734a493091cd6441f3ccb8d42739f680ff52c90b004d6ad5d3a97e0f68bb2b031b3d432be38ae20e9a4d8d01ffc5893
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue