October 2014 - openSUSE Commits - openSUSE Mailing Lists

commit haproxy for openSUSE:Factory
by root＠hilbert.suse.de 07 Oct '14

07 Oct '14

Hello community, here is the log from the commit of package haproxy for openSUSE:Factory checked in at 2014-10-07 16:00:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haproxy (Old) and /work/SRC/openSUSE:Factory/.haproxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "haproxy" Changes: -------- --- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2014-09-26 11:21:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.haproxy.new/haproxy.changes 2014-10-07 16:01:19.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Oct 6 09:09:58 UTC 2014 - kgronlund(a)suse.com + +- Backported fixes: + - BUG/MEDIUM: http: adjust close mode when switching to backend + - BUG/MINOR: config: don't propagate process binding on fatal errors. + - BUG/MEDIUM: check: rule-less tcp-check must detect connect failures + - BUG/MINOR: tcp-check: report the correct failed step in the status + - BUG/MINOR: config: don't propagate process binding for dynamic use_backend + +- Added patches: + - 0016-BUG-MEDIUM-http-adjust-close-mode-when-switching-to-.patch + - 0017-BUG-MINOR-config-don-t-propagate-process-binding-on-.patch + - 0018-BUG-MEDIUM-check-rule-less-tcp-check-must-detect-con.patch + - 0019-BUG-MINOR-tcp-check-report-the-correct-failed-step-i.patch + - 0020-BUG-MINOR-config-don-t-propagate-process-binding-for.patch + +------------------------------------------------------------------- New: ---- 0016-BUG-MEDIUM-http-adjust-close-mode-when-switching-to-.patch 0017-BUG-MINOR-config-don-t-propagate-process-binding-on-.patch 0018-BUG-MEDIUM-check-rule-less-tcp-check-must-detect-con.patch 0019-BUG-MINOR-tcp-check-report-the-correct-failed-step-i.patch 0020-BUG-MINOR-config-don-t-propagate-process-binding-for.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haproxy.spec ++++++ --- /var/tmp/diff_new_pack.FvvQR2/_old 2014-10-07 16:01:20.000000000 +0200 +++ /var/tmp/diff_new_pack.FvvQR2/_new 2014-10-07 16:01:20.000000000 +0200 @@ -91,6 +91,17 @@ Patch18: 0014-MEDIUM-systemd-wrapper-support-multiple-executable-v.patch # PATCH-FIX-UPSTREAM: BUG/MEDIUM: remove debugging code from systemd-wrapper Patch19: 0015-BUG-MEDIUM-remove-debugging-code-from-systemd-wrappe.patch +# PATCH-FIX-UPSTREAM: BUG/MEDIUM: http: adjust close mode when switching to backend +Patch20: 0016-BUG-MEDIUM-http-adjust-close-mode-when-switching-to-.patch +# PATCH-FIX-UPSTREAM: BUG/MINOR: config: don't propagate process binding on fatal errors. +Patch21: 0017-BUG-MINOR-config-don-t-propagate-process-binding-on-.patch +# PATCH-FIX-UPSTREAM: BUG/MEDIUM: check: rule-less tcp-check must detect connect failures +Patch22: 0018-BUG-MEDIUM-check-rule-less-tcp-check-must-detect-con.patch +# PATCH-FIX-UPSTREAM: BUG/MINOR: tcp-check: report the correct failed step in the status +Patch23: 0019-BUG-MINOR-tcp-check-report-the-correct-failed-step-i.patch +# PATCH-FIX-UPSTREAM: BUG/MINOR: config: don't propagate process binding for dynamic use_backend +Patch24: 0020-BUG-MINOR-config-don-t-propagate-process-binding-for.patch + Source99: haproxy-rpmlintrc # Summary: The Reliable, High Performance TCP/HTTP Load Balancer @@ -139,6 +150,11 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 %build %{__make} \ ++++++ 0016-BUG-MEDIUM-http-adjust-close-mode-when-switching-to-.patch ++++++ >From 2e47a3ab11188239abadb6bba7bd901d764aa4fb Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Tue, 30 Sep 2014 18:44:22 +0200 Subject: [PATCH 16/20] BUG/MEDIUM: http: adjust close mode when switching to backend Commit 179085c ("MEDIUM: http: move Connection header processing earlier") introduced a regression : the backend's HTTP mode is not considered anymore when setting the session's HTTP mode, because wait_for_request() is only called once, when the frontend receives the request (or when the frontend is in TCP mode, when the backend receives the request). The net effect is that in some situations when the frontend and the backend do not work in the same mode (eg: keep-alive vs close), the backend's mode is ignored. This patch moves all that processing to a dedicated function, which is called from the original place, as well as from session_set_backend() when switching from an HTTP frontend to an HTTP backend in different modes. This fix must be backported to 1.5. (cherry picked from commit 4e21ff9244aefa56bcf0793a9e07edba2c3c1960) --- include/proto/proto_http.h | 1 + src/proto_http.c | 107 +++++++++++++++++++++++---------------------- src/proxy.c | 8 ++++ 3 files changed, 64 insertions(+), 52 deletions(-) diff --git a/include/proto/proto_http.h b/include/proto/proto_http.h index e898ca8..8014310 100644 --- a/include/proto/proto_http.h +++ b/include/proto/proto_http.h @@ -112,6 +112,7 @@ unsigned int http_get_hdr(const struct http_msg *msg, const char *hname, int hle void http_init_txn(struct session *s); void http_end_txn(struct session *s); void http_reset_txn(struct session *s); +void http_adjust_conn_mode(struct session *s, struct http_txn *txn, struct http_msg *msg); struct http_req_rule *parse_http_req_cond(const char **args, const char *file, int linenum, struct proxy *proxy); struct http_res_rule *parse_http_res_cond(const char **args, const char *file, int linenum, struct proxy *proxy); diff --git a/src/proto_http.c b/src/proto_http.c index 7e35c8b..20e7088 100644 --- a/src/proto_http.c +++ b/src/proto_http.c @@ -2393,6 +2393,59 @@ fail: return 0; } +void http_adjust_conn_mode(struct session *s, struct http_txn *txn, struct http_msg *msg) +{ + int tmp = TX_CON_WANT_KAL; + + if (!((s->fe->options2|s->be->options2) & PR_O2_FAKE_KA)) { + if ((s->fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_TUN || + (s->be->options & PR_O_HTTP_MODE) == PR_O_HTTP_TUN) + tmp = TX_CON_WANT_TUN; + + if ((s->fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_PCL || + (s->be->options & PR_O_HTTP_MODE) == PR_O_HTTP_PCL) + tmp = TX_CON_WANT_TUN; + } + + if ((s->fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_SCL || + (s->be->options & PR_O_HTTP_MODE) == PR_O_HTTP_SCL) { + /* option httpclose + server_close => forceclose */ + if ((s->fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_PCL || + (s->be->options & PR_O_HTTP_MODE) == PR_O_HTTP_PCL) + tmp = TX_CON_WANT_CLO; + else + tmp = TX_CON_WANT_SCL; + } + + if ((s->fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_FCL || + (s->be->options & PR_O_HTTP_MODE) == PR_O_HTTP_FCL) + tmp = TX_CON_WANT_CLO; + + if ((txn->flags & TX_CON_WANT_MSK) < tmp) + txn->flags = (txn->flags & ~TX_CON_WANT_MSK) | tmp; + + if (!(txn->flags & TX_HDR_CONN_PRS) && + (txn->flags & TX_CON_WANT_MSK) != TX_CON_WANT_TUN) { + /* parse the Connection header and possibly clean it */ + int to_del = 0; + if ((msg->flags & HTTP_MSGF_VER_11) || + ((txn->flags & TX_CON_WANT_MSK) >= TX_CON_WANT_SCL && + !((s->fe->options2|s->be->options2) & PR_O2_FAKE_KA))) + to_del |= 2; /* remove "keep-alive" */ + if (!(msg->flags & HTTP_MSGF_VER_11)) + to_del |= 1; /* remove "close" */ + http_parse_connection_header(txn, msg, to_del); + } + + /* check if client or config asks for explicit close in KAL/SCL */ + if (((txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_KAL || + (txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_SCL) && + ((txn->flags & TX_HDR_CONN_CLO) || /* "connection: close" */ + (!(msg->flags & HTTP_MSGF_VER_11) && !(txn->flags & TX_HDR_CONN_KAL)) || /* no "connection: k-a" in 1.0 */ + !(msg->flags & HTTP_MSGF_XFER_LEN) || /* no length known => close */ + s->fe->state == PR_STSTOPPED)) /* frontend is stopping */ + txn->flags = (txn->flags & ~TX_CON_WANT_MSK) | TX_CON_WANT_CLO; +} /* This stream analyser waits for a complete HTTP request. It returns 1 if the * processing can continue on next analysers, or zero if it either needs more @@ -2929,58 +2982,8 @@ int http_wait_for_request(struct session *s, struct channel *req, int an_bit) * time. */ if (!(txn->flags & TX_HDR_CONN_PRS) || - ((s->fe->options & PR_O_HTTP_MODE) != (s->be->options & PR_O_HTTP_MODE))) { - int tmp = TX_CON_WANT_KAL; - - if (!((s->fe->options2|s->be->options2) & PR_O2_FAKE_KA)) { - if ((s->fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_TUN || - (s->be->options & PR_O_HTTP_MODE) == PR_O_HTTP_TUN) - tmp = TX_CON_WANT_TUN; - - if ((s->fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_PCL || - (s->be->options & PR_O_HTTP_MODE) == PR_O_HTTP_PCL) - tmp = TX_CON_WANT_TUN; - } - - if ((s->fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_SCL || - (s->be->options & PR_O_HTTP_MODE) == PR_O_HTTP_SCL) { - /* option httpclose + server_close => forceclose */ - if ((s->fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_PCL || - (s->be->options & PR_O_HTTP_MODE) == PR_O_HTTP_PCL) - tmp = TX_CON_WANT_CLO; - else - tmp = TX_CON_WANT_SCL; - } - - if ((s->fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_FCL || - (s->be->options & PR_O_HTTP_MODE) == PR_O_HTTP_FCL) - tmp = TX_CON_WANT_CLO; - - if ((txn->flags & TX_CON_WANT_MSK) < tmp) - txn->flags = (txn->flags & ~TX_CON_WANT_MSK) | tmp; - - if (!(txn->flags & TX_HDR_CONN_PRS) && - (txn->flags & TX_CON_WANT_MSK) != TX_CON_WANT_TUN) { - /* parse the Connection header and possibly clean it */ - int to_del = 0; - if ((msg->flags & HTTP_MSGF_VER_11) || - ((txn->flags & TX_CON_WANT_MSK) >= TX_CON_WANT_SCL && - !((s->fe->options2|s->be->options2) & PR_O2_FAKE_KA))) - to_del |= 2; /* remove "keep-alive" */ - if (!(msg->flags & HTTP_MSGF_VER_11)) - to_del |= 1; /* remove "close" */ - http_parse_connection_header(txn, msg, to_del); - } - - /* check if client or config asks for explicit close in KAL/SCL */ - if (((txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_KAL || - (txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_SCL) && - ((txn->flags & TX_HDR_CONN_CLO) || /* "connection: close" */ - (!(msg->flags & HTTP_MSGF_VER_11) && !(txn->flags & TX_HDR_CONN_KAL)) || /* no "connection: k-a" in 1.0 */ - !(msg->flags & HTTP_MSGF_XFER_LEN) || /* no length known => close */ - s->fe->state == PR_STSTOPPED)) /* frontend is stopping */ - txn->flags = (txn->flags & ~TX_CON_WANT_MSK) | TX_CON_WANT_CLO; - } + ((s->fe->options & PR_O_HTTP_MODE) != (s->be->options & PR_O_HTTP_MODE))) + http_adjust_conn_mode(s, txn, msg); /* end of job, return OK */ req->analysers &= ~an_bit; diff --git a/src/proxy.c b/src/proxy.c index 02103ee..405c4c4 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -955,6 +955,14 @@ int session_set_backend(struct session *s, struct proxy *be) http_init_txn(s); } + /* If we chain to an HTTP backend running a different HTTP mode, we + * have to re-adjust the desired keep-alive/close mode to accommodate + * both the frontend's and the backend's modes. + */ + if (s->fe->mode == PR_MODE_HTTP && be->mode == PR_MODE_HTTP && + ((s->fe->options & PR_O_HTTP_MODE) != (be->options & PR_O_HTTP_MODE))) + http_adjust_conn_mode(s, &s->txn, &s->txn.req); + /* If an LB algorithm needs to access some pre-parsed body contents, * we must not start to forward anything until the connection is * confirmed otherwise we'll lose the pointer to these data and -- 1.8.4.5 ++++++ 0017-BUG-MINOR-config-don-t-propagate-process-binding-on-.patch ++++++ >From b3228c83e320ad168f5b3e6884e771530a68a449 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Wed, 1 Oct 2014 20:50:17 +0200 Subject: [PATCH 17/20] BUG/MINOR: config: don't propagate process binding on fatal errors. propagate_processes() must not be called with unresolved proxies, but nothing prevents it from being called in check_config_validity(). The resulting effect is that an unresolved proxy can cause a recursion loop if called in such a situation, ending with a segfault after the fatal error report. There's no side effect beyond this. This patch refrains from calling the function when any error was met. This bug also affects 1.5, it should be backported. (cherry picked from commit acbe8ab38a638a076f8cf9fe2635db0e729d6a1f) --- src/cfgparse.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/cfgparse.c b/src/cfgparse.c index f723a3a..6e962c8 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -7112,10 +7112,14 @@ out_uri_auth_compat: global.stats_fe->bind_proc = ~0UL; } - /* propagate bindings from frontends to backends */ - for (curproxy = proxy; curproxy; curproxy = curproxy->next) { - if (curproxy->cap & PR_CAP_FE) - propagate_processes(curproxy, NULL); + /* propagate bindings from frontends to backends. Don't do it if there + * are any fatal errors as we must not call it with unresolved proxies. + */ + if (!cfgerr) { + for (curproxy = proxy; curproxy; curproxy = curproxy->next) { + if (curproxy->cap & PR_CAP_FE) + propagate_processes(curproxy, NULL); + } } /* Bind each unbound backend to all processes when not specified. */ -- 1.8.4.5 ++++++ 0018-BUG-MEDIUM-check-rule-less-tcp-check-must-detect-con.patch ++++++ >From e61737a721c3b91c79484e51fc1789293b269f9f Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Thu, 2 Oct 2014 14:30:14 +0200 Subject: [PATCH 18/20] BUG/MEDIUM: check: rule-less tcp-check must detect connect failures When "option tcp-check" is specified without any tcp-check rules, the documentation says that it's the same as the default check method. But the code path is a bit different, and we used to consider that since the end of rules was reached, the check is always successful regardless of the connection status. This patch reorganizes the error detection, and considers the special case where there's no tcp-check rule as a real L4 check. It also avoids dereferencing the rule list head as a rule by itself. While fixing this bug, another one related to the output messages' accuracy was noticed, it will be fixed in a separate commit and is much less important. This bug is also present in 1.5, so this fix must be backported. (cherry picked from commit ef953953e7f33c6a72c432fce8d47c2d84c69512) --- src/checks.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/src/checks.c b/src/checks.c index f3b2b54..9c1a866 100644 --- a/src/checks.c +++ b/src/checks.c @@ -1837,20 +1837,34 @@ static int tcpcheck_get_step_id(struct server *s) static void tcpcheck_main(struct connection *conn) { char *contentptr; - struct list *head = NULL; struct tcpcheck_rule *cur = NULL; int done = 0, ret = 0; - struct check *check = conn->owner; struct server *s = check->server; struct task *t = check->task; + struct list *head = &s->proxy->tcpcheck_rules; - /* - * don't do anything until the connection is established but if we're running - * first step which must be a connect + /* here, we know that the check is complete or that it failed */ + if (check->result != CHK_RES_UNKNOWN) + goto out_end_tcpcheck; + + /* We have 4 possibilities here : + * 1. we've not yet attempted step 1, and step 1 is a connect, so no + * connection attempt was made yet ; + * 2. we've not yet attempted step 1, and step 1 is a not connect or + * does not exist (no rule), so a connection attempt was made + * before coming here. + * 3. we're coming back after having started with step 1, so we may + * be waiting for a connection attempt to complete. + * 4. the connection + handshake are complete + * + * #2 and #3 are quite similar, we want both the connection and the + * handshake to complete before going any further. Thus we must always + * wait for a connection to complete unless we're before and existing + * step 1. */ - if (check->current_step && (!(conn->flags & CO_FL_CONNECTED))) { - /* update expire time, should be done by process_chk */ + if ((!(conn->flags & CO_FL_CONNECTED) || (conn->flags & CO_FL_HANDSHAKE)) && + (check->current_step || LIST_ISEMPTY(head))) { /* we allow up to min(inter, timeout.connect) for a connection * to establish but only when timeout.check is set * as it may be to short for a full check otherwise @@ -1867,12 +1881,11 @@ static void tcpcheck_main(struct connection *conn) return; } - /* here, we know that the connection is established */ - if (check->result != CHK_RES_UNKNOWN) + /* special case: option tcp-check with no rule, a connect is enough */ + if (LIST_ISEMPTY(head)) { + set_server_check_status(check, HCHK_STATUS_L4OK, NULL); goto out_end_tcpcheck; - - /* head is be the first element of the double chained list */ - head = &s->proxy->tcpcheck_rules; + } /* no step means first step * initialisation */ @@ -1891,9 +1904,6 @@ static void tcpcheck_main(struct connection *conn) cur = check->current_step; } - if (conn->flags & CO_FL_HANDSHAKE) - return; - /* It's only the rules which will enable send/recv */ __conn_data_stop_both(conn); -- 1.8.4.5 ++++++ 0019-BUG-MINOR-tcp-check-report-the-correct-failed-step-i.patch ++++++ >From 90055f28a7a0c86cfb37ccb23a548a1da7229551 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Thu, 2 Oct 2014 14:51:02 +0200 Subject: [PATCH 19/20] BUG/MINOR: tcp-check: report the correct failed step in the status The step number was reported by checking only last_started_step, which was not set in case of error during the initial connection phase, and caused "step 1" to be returned with an invalid check type (typically SEND). So now we first verify that a test was started before returning this. In addition to this, the indication of the test type was taken from current_step instead of last_started_step, so the error description was matching the next action instead of the one reported in the step ID. Thus we could get the confusing "step 1 (send)" report below : tcp-check connect tcp-check send foo In order to ease debugging, when the port number is known for a connect, it is indicated in the error report. Note that this only affects asynchronous error messages, synchronous ones are correct. This fix must be backported to 1.5. (cherry picked from commit 213c6785614d0228d7e96e982e5189e1d0777059) --- src/checks.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/src/checks.c b/src/checks.c index 9c1a866..5318f35 100644 --- a/src/checks.c +++ b/src/checks.c @@ -580,6 +580,7 @@ static void chk_report_conn_err(struct connection *conn, int errno_bck, int expi struct check *check = conn->owner; const char *err_msg; struct chunk *chk; + int step; if (check->result != CHK_RES_UNKNOWN) return; @@ -599,19 +600,27 @@ static void chk_report_conn_err(struct connection *conn, int errno_bck, int expi chk = get_trash_chunk(); if (check->type == PR_O2_TCPCHK_CHK) { - chunk_printf(chk, " at step %d of tcp-check", tcpcheck_get_step_id(check->server)); - /* we were looking for a string */ - if (check->current_step && check->current_step->action == TCPCHK_ACT_CONNECT) { - chunk_appendf(chk, " (connect)"); - } - else if (check->current_step && check->current_step->action == TCPCHK_ACT_EXPECT) { - if (check->current_step->string) - chunk_appendf(chk, " (string '%s')", check->current_step->string); - else if (check->current_step->expect_regex) - chunk_appendf(chk, " (expect regex)"); - } - else if (check->current_step && check->current_step->action == TCPCHK_ACT_SEND) { - chunk_appendf(chk, " (send)"); + step = tcpcheck_get_step_id(check->server); + if (!step) + chunk_printf(chk, " at initial connection step of tcp-check"); + else { + chunk_printf(chk, " at step %d of tcp-check", step); + /* we were looking for a string */ + if (check->last_started_step && check->last_started_step->action == TCPCHK_ACT_CONNECT) { + if (check->last_started_step->port) + chunk_appendf(chk, " (connect port %d)" ,check->last_started_step->port); + else + chunk_appendf(chk, " (connect)"); + } + else if (check->last_started_step && check->last_started_step->action == TCPCHK_ACT_EXPECT) { + if (check->last_started_step->string) + chunk_appendf(chk, " (string '%s')", check->last_started_step->string); + else if (check->last_started_step->expect_regex) + chunk_appendf(chk, " (expect regex)"); + } + else if (check->last_started_step && check->last_started_step->action == TCPCHK_ACT_SEND) { + chunk_appendf(chk, " (send)"); + } } } @@ -1818,6 +1827,10 @@ static int tcpcheck_get_step_id(struct server *s) struct tcpcheck_rule *cur = NULL, *next = NULL; int i = 0; + /* not even started anything yet => step 0 = initial connect */ + if (!s->check.current_step) + return 0; + cur = s->check.last_started_step; /* no step => first step */ @@ -1887,9 +1900,9 @@ static void tcpcheck_main(struct connection *conn) goto out_end_tcpcheck; } - /* no step means first step - * initialisation */ + /* no step means first step initialisation */ if (check->current_step == NULL) { + check->last_started_step = NULL; check->bo->p = check->bo->data; check->bo->o = 0; check->bi->p = check->bi->data; -- 1.8.4.5 ++++++ 0020-BUG-MINOR-config-don-t-propagate-process-binding-for.patch ++++++ >From c8d57dec6173430bd5602bb76efff302c51e7803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20Bont=C3=A9?= <cyril.bonte(a)free.fr> Date: Thu, 2 Oct 2014 19:56:25 +0200 Subject: [PATCH 20/20] BUG/MINOR: config: don't propagate process binding for dynamic use_backend A segfault was reported with the introduction of the propagate_processes() function. It was caused when a use_backend rule was declared with a dynamic name, using a log-format string. The backend is not resolved during the configuration, which lead to the segfault. The patch prevents the process binding propagation for such dynamic rules, it should also be backported to 1.5. (cherry picked from commit 51639696e0a112ea3612e905a5722ad912b3869f) --- src/cfgparse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cfgparse.c b/src/cfgparse.c index 6e962c8..ec6d923 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -6015,6 +6015,8 @@ void propagate_processes(struct proxy *from, struct proxy *to) /* use_backend */ list_for_each_entry(rule, &from->switching_rules, list) { + if (rule->dynamic) + continue; to = rule->be.backend; propagate_processes(from, to); } -- 1.8.4.5 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fossil for openSUSE:Factory
by root＠hilbert.suse.de 07 Oct '14

07 Oct '14

Hello community, here is the log from the commit of package fossil for openSUSE:Factory checked in at 2014-10-07 16:00:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fossil (Old) and /work/SRC/openSUSE:Factory/.fossil.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fossil" Changes: -------- --- /work/SRC/openSUSE:Factory/fossil/fossil.changes 2014-06-01 19:41:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fossil.new/fossil.changes 2014-10-07 16:01:17.000000000 +0200 @@ -1,0 +2,66 @@ +Mon Sep 22 23:15:08 UTC 2014 - andreas.stieger(a)gmx.de + +- fossil 1.29: + * Add the ability to display content, diffs and annotations for + UTF16 text files in the web interface. + * Add the "SaveAs..." and "Invert" buttons to the graphical diff + display that results from using the --tk option with the fossil + diff command. + * The /reports page now requires Read ("o") permissions. The + "byweek" report now properly propagates the selected year + through the event type filter links. + * The info command now shows leaf status of the checkout. + * Add support for tunneling https through a http proxy + * Add option --empty to the "fossil open" command. + * Enhanced the fileage page to support a glob parameter. + * Add -w|--ignore-all-space and -Z|--ignore-trailing-space + options to fossil annotate, fossil blame, fossil (g)diff, + fossil stash diff. + * Add --strip-trailing-cr option to fossil (g)diff and fossil + stash diff. + * Add button "Ignore Whitespace" to /annotate, /blame, /ci, /fdiff + and /vdiff UI pages. + * Enhance /reports with a "byweekday" view. + * Enhance the fossil cat command so that it works outside of a + checkout when using the -R command-line option. + * Use full-length SHA1 hashes, not abbreviations, in most + hyperlinks. + * Correctly render the <title> markup on wiki pages in the + /artifact webpage. + * Enhance the fossil whatis command to report on attachments + and cluster artifacts. Added the /help?cmd=test-whatis-all + command for testing purposes. + * Add support for HTTP Basic Authentication on clone and sync. + * Fix the stash so that it remembers added files and re-adds them + when the stash is applied. + * Fix the server so that it avoids writing to the database (and + thus avoids database locking issues) on a pull or clone. + * Add support for server load management using both a cache of + expensive pages (the fossil cache command) and by rejecting + expensive page requests when the server load average is too + high. + * Add the fossil praise command as an alias for fossil blame for + subversion compatibility. + * Enhance the fossil test-diff command with -y or --tk options so + that it shows both filenames above their respective columns in + the side-by-side diff output. + * Issue a warning if a fossil add command tries to add a file that + matches the ignore-glob. + * Add option -W|--width to "fossil stash ls" and "fossil leaves" + commands. + * Enhance support for running as the root user + * Added the -empty option to fossil new, which causes it to not + create an initial empty commit. The first commit after + checking out a repo created this way will become the initial + commit. + * Enhance sync operations by committing each round-trip to + minimize number of retransmits when autosync fails. Include + option for fossil update and fossil merge to continue even if + missing content. + * Minor portability fixes for platforms where the char type is + unsigned by default. +- use source URLs +- verify source signatures +- add fossil-1.29-remove_date_time.patch to fix packaging warning + +------------------------------------------------------------------- Old: ---- fossil-1.28.tar.gz New: ---- fossil-1.29-remove_date_time.patch fossil-src-20140612172556.tar.gz fossil.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fossil.spec ++++++ --- /var/tmp/diff_new_pack.gBG5Kz/_old 2014-10-07 16:01:19.000000000 +0200 +++ /var/tmp/diff_new_pack.gBG5Kz/_new 2014-10-07 16:01:19.000000000 +0200 @@ -16,25 +16,26 @@ # +%define timestamp 20140612172556 Name: fossil -Version: 1.28 +Version: 1.29 Release: 0 Summary: Simple, high-reliability, distributed software configuration management License: BSD-2-Clause Group: Development/Tools/Version Control Url: http://www.fossil-scm.org/ -# To download the source tarbal: -# wget --post-data "uuid=version-$VERSION" "http://www.fossil-scm.org/fossil/tarball/fossil-$VERSION.tar.gz" -Source: fossil-%version.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: http://www.fossil-scm.org/download/%{name}-src-%{timestamp}.tar.gz +Source2: http://www.hwaci.com/fossil_download_checksums.html#/%{name}.asc +Patch1: fossil-1.29-remove_date_time.patch BuildRequires: gcc +BuildRequires: tcl +BuildRequires: zlib-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1140 BuildRequires: libopenssl-devel %else BuildRequires: openssl-devel %endif -BuildRequires: tcl -BuildRequires: zlib-devel %description There are plenty of open-source version control systems available on @@ -82,17 +83,22 @@ ever been lost after having been committed to a Fossil repository. %prep -%setup -q +# check tarball hashes +echo "`grep %{name}-src-%{timestamp}.tar.gz %{SOURCE2} | cut -d' ' -f1` %{SOURCE0}" | sha1sum -c +%setup -q -n %{name}-src-%{timestamp} +# test package version and source version match +grep -qFx %{version} VERSION +%patch1 -p1 %build -export CFLAGS="%optflags" +export CFLAGS="%{optflags}" ./configure \ - --prefix=%_prefix \ + --prefix=%{_prefix} \ --with-openssl -make %{_smp_mflags} +make %{?_smp_mflags} %install -make DESTDIR=%buildroot install +make DESTDIR=%{buildroot} install %{?_smp_mflags} %files %defattr(-,root,root) ++++++ fossil-1.29-remove_date_time.patch ++++++ From: Andreas Stieger <andreas.stieger(a)gmx.de> Date: Tue, 23 Sep 2014 00:14:29 +0100 Subject: Remove __DATE and __TIME__ to prevent unneccessary rebuilds Upstream: never References: fossil.i586: W: file-contains-date-and-time /usr/bin/fossil Your file uses __DATE and __TIME__ this causes the package to rebuild when not needed --- src/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: fossil-src-20140612172556/src/main.c =================================================================== --- fossil-src-20140612172556.orig/src/main.c 2014-06-12 18:33:27.000000000 +0100 +++ fossil-src-20140612172556/src/main.c 2014-09-23 00:03:51.000000000 +0100 @@ -856,8 +856,8 @@ void version_cmd(void){ int rc; const char *zRc; #endif - fossil_print("Compiled on %s %s using %s (%d-bit)\n", - __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8); + fossil_print("Compiled using %s (%d-bit)\n", + COMPILER_NAME, sizeof(void*)*8); fossil_print("SQLite %s %.30s\n", sqlite3_libversion(), sqlite3_sourceid()); fossil_print("Schema version %s\n", AUX_SCHEMA); fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion()); ++++++ fossil.asc ++++++ <html> <title>Fossil Download Checksums</title> <body> <h1 align="center">Checksums For Fossil Downloads</h1> <p>The following table shows the SHA1 checksums for the precompiled binaries available on the <a href="http://www.fossil-scm.org/download.html">Fossil website</a>.</p> <pre> 940f83f0f6c634c8563ca6b5d8e2a42ff369f341 fossil-linux-x86-20130911114349.zip fa3b3bfbd101deb7b79c5ee8a241a41c6b1b965d fossil-linux-x86-20140127173344.zip cd0f1709d569544f32d30f779187f69d2e03a18b fossil-linux-x86-20140612172556.zip 557e5d8d25ce4fd2362464d0a92ab243aff79296 fossil-macosx-x86-20130911114349.zip a133cfeca3d12b289aeb63d597f4cfc44a8a9fc9 fossil-macosx-x86-20140127173344.zip bbf3d57ba15d0ed0e9b30819d89a50d294175113 fossil-macosx-x86-20140612172556.zip 9fbdaee42e6cbe6f8f491ab5fb2c4ee2b9ecf7d4 fossil-openbsd-x86-20130911114349.zip 904ce0bcecfd29f595bbcb6642c9ac594e835424 fossil-openbsd-x86-20140127173344.zip 6cd05c1743902aa1a5191bd34ebefe87701fa25e fossil-openbsd-x86-20140612172556.zip 2e2149fff30d63a1869ecb5a7d6b17996477612a fossil-src-20130911114349.tar.gz 9e547a27d2447f12df951e86670da12c7cfbd26a fossil-src-20140127173344.tar.gz 173c3350ba39ecfee6e660f866b4f3104e351b33 fossil-src-20140612172556.tar.gz be5321201df9ac2e8164ad9483620306da8a126a fossil-w32-20130911114349.zip c43047ce068506c76af0970ab793958d2b7e7895 fossil-w32-20140127173344.zip 8dd23c9a17e7afefe7b8497b76bd18461d10ec44 fossil-w32-20140612172556.zip 2133a5a156adcd9eb867c145ba353164529c2c65 releasenotes-20130911114349.html 6431b6823278e384a9c952479ef6deeb037d362b releasenotes-20140127173344.html a31ee35d9ae3a0da34268ec5e2b3f83600d17a71 releasenotes-20140612172556.html </pre> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa-tools for openSUSE:Factory
by root＠hilbert.suse.de 07 Oct '14

07 Oct '14

Hello community, here is the log from the commit of package alsa-tools for openSUSE:Factory checked in at 2014-10-07 16:00:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-tools (Old) and /work/SRC/openSUSE:Factory/.alsa-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alsa-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-tools/alsa-tools.changes 2014-09-06 16:53:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-tools.new/alsa-tools.changes 2014-10-07 16:01:15.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 3 19:51:55 UTC 2014 - crrodriguez(a)opensuse.org + +- Remove xorg-x11-devel from BuildRequires. x libraries + are not directly used. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-tools.spec ++++++ --- /var/tmp/diff_new_pack.nVfQMI/_old 2014-10-07 16:01:17.000000000 +0200 +++ /var/tmp/diff_new_pack.nVfQMI/_new 2014-10-07 16:01:17.000000000 +0200 @@ -50,7 +50,6 @@ BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: update-desktop-files -BuildRequires: xorg-x11-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{have_fltk} BuildRequires: fltk-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit genromfs for openSUSE:Factory
by root＠hilbert.suse.de 07 Oct '14

07 Oct '14

Hello community, here is the log from the commit of package genromfs for openSUSE:Factory checked in at 2014-10-07 16:00:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/genromfs (Old) and /work/SRC/openSUSE:Factory/.genromfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "genromfs" Changes: -------- --- /work/SRC/openSUSE:Factory/genromfs/genromfs.changes 2011-10-04 18:10:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.genromfs.new/genromfs.changes 2014-10-07 16:01:11.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Oct 6 11:19:01 UTC 2014 - pgajdos(a)suse.com + +- fix source URL + +------------------------------------------------------------------- +Mon Oct 6 10:20:20 UTC 2014 - jengelh(a)inai.de + +- Remove ancient/unused spec tags/sections +- Use Source URLs and update the description + +------------------------------------------------------------------- Old: ---- genromfs-0.5.2.tar.bz2 New: ---- genromfs-0.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ genromfs.spec ++++++ --- /var/tmp/diff_new_pack.goFJg2/_old 2014-10-07 16:01:14.000000000 +0200 +++ /var/tmp/diff_new_pack.goFJg2/_new 2014-10-07 16:01:14.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package genromfs # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,25 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: genromfs +Version: 0.5.2 +Release: 0 +Summary: Utility for Creating romfs File Systems License: GPL-2.0+ Group: System/Boot -AutoReqProv: on -Version: 0.5.2 -Release: 74 Url: http://romfs.sourceforge.net -Source: %{name}-%{version}.tar.bz2 + +Source: http://downloads.sf.net/romfs/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Utility for Creating romfs File Systems %description Genromfs is a tool for creating romfs file systems, which are lightweight, read-only file systems supported by the Linux kernel. -Romfs file systems are mainly used for the initial RAM disks used -during installation. +Romfs file systems were traditionally used for the initial RAM disks +used during installation. @@ -50,13 +48,10 @@ %install make PREFIX=$RPM_BUILD_ROOT mandir=%{_mandir} install -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc COPYING NEWS ChangeLog genromfs.lsm romfs.txt %doc %{_mandir}/man8/genromfs.8.gz -/usr/bin/genromfs +%_bindir/genromfs %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit leechcraft for openSUSE:Factory
by root＠hilbert.suse.de 07 Oct '14

07 Oct '14

Hello community, here is the log from the commit of package leechcraft for openSUSE:Factory checked in at 2014-10-07 16:00:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/leechcraft (Old) and /work/SRC/openSUSE:Factory/.leechcraft.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "leechcraft" Changes: -------- --- /work/SRC/openSUSE:Factory/leechcraft/leechcraft.changes 2014-08-14 14:58:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.leechcraft.new/leechcraft.changes 2014-10-07 16:01:08.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 10 15:35:22 UTC 2014 - dap.darkness(a)gmail.com + +- A new plugin was enabled: + * Eleeminator is a a terminal emulator. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leechcraft.spec ++++++ --- /var/tmp/diff_new_pack.kVFkkP/_old 2014-10-07 16:01:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kVFkkP/_new 2014-10-07 16:01:11.000000000 +0200 @@ -141,6 +141,7 @@ BuildRequires: pkgconfig(poppler-cpp) BuildRequires: pkgconfig(poppler-qt4) BuildRequires: pkgconfig(qca2) +BuildRequires: pkgconfig(qtermwidget4) >= 0.5.1 BuildRequires: pkgconfig(qxmpp) >= 0.8 BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xdamage) @@ -1012,6 +1013,18 @@ It also uses Phonon as a backend or something like aplay/mplayer. +%package eleeminator +Summary: LeechCraft Eleeminator Module +License: BSL-1.0 +Group: Productivity/Networking/Other +Requires: %{name} = %{version} +Provides: %{name}-shaitan = %{version} +Obsoletes: %{name}-shaitan < %{version} + +%description eleeminator +This package provides a terminal plugin for Leechcraft. + + %package fenet Summary: LeechCraft Window Manager Module License: BSL-1.0 @@ -2470,7 +2483,7 @@ -DENABLE_DOLOZHEE=True \ -DENABLE_DUMBEEP=True \ -DDUMBEEP_WITH_PHONON=True \ - -DENABLE_ELEEMINATOR=False \ + -DENABLE_ELEEMINATOR=True \ -DENABLE_FENET=True \ -DENABLE_GACTS=True \ %if 0%{?suse_version} > 1310 @@ -3065,6 +3078,13 @@ %{_libdir}/%{name}/plugins/lib%{name}_dumbeep.so %{_datadir}/%{name}/settings/dumbeepsettings.xml +%files eleeminator +%defattr(-,root,root) +%{_libdir}/%{name}/plugins/lib%{name}_eleeminator.so +%{_datadir}/%{name}/translations/%{name}_eleeminator_??.qm +%{_datadir}/%{name}/translations/%{name}_eleeminator_??_??.qm +%{_datadir}/%{name}/settings/eleeminatorsettings.xml + %files fenet %defattr(-,root,root) %{_libdir}/%{name}/plugins/*%{name}_fenet.so -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit extra-cmake-modules for openSUSE:Factory
by root＠hilbert.suse.de 07 Oct '14

07 Oct '14

Hello community, here is the log from the commit of package extra-cmake-modules for openSUSE:Factory checked in at 2014-10-07 16:00:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old) and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "extra-cmake-modules" Changes: -------- --- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes 2014-09-12 17:03:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes 2014-10-07 16:01:06.000000000 +0200 @@ -1,0 +2,12 @@ +Sat Oct 4 17:59:54 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 1.3.0 + * New module ECMGeneratePkgConfigFile, for frameworks to + install a pkgconfig file. + * New option ECM_ENABLE_SANITIZERS, to enable clang sanitizers. + Example: ECM_ENABLE_SANITIZERS='address;undefined' + * New option BUILD_COVERAGE, to enable code coverage. + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.3.0.php + +------------------------------------------------------------------- Old: ---- extra-cmake-modules-1.2.0.tar.xz New: ---- extra-cmake-modules-1.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ extra-cmake-modules.spec ++++++ --- /var/tmp/diff_new_pack.6uuZJH/_old 2014-10-07 16:01:08.000000000 +0200 +++ /var/tmp/diff_new_pack.6uuZJH/_new 2014-10-07 16:01:08.000000000 +0200 @@ -21,9 +21,9 @@ License: BSD-3-Clause Group: Development/Tools/Other Url: https://projects.kde.org/projects/kdesupport/extra-cmake-modules -Version: 1.2.0 +Version: 1.3.0 Release: 0 -Source: http://download.kde.org/stable/frameworks/5.2.0/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/5.3.0/%{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 2.8.12 BuildRequires: gcc-c++ ++++++ extra-cmake-modules-1.2.0.tar.xz -> extra-cmake-modules-1.3.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/CMakeLists.txt new/extra-cmake-modules-1.3.0/CMakeLists.txt --- old/extra-cmake-modules-1.2.0/CMakeLists.txt 2014-09-06 00:20:45.000000000 +0200 +++ new/extra-cmake-modules-1.3.0/CMakeLists.txt 2014-10-03 22:53:30.000000000 +0200 @@ -3,7 +3,7 @@ project(extra-cmake-modules NONE) set(ECM_MAJOR_VERSION 1) -set(ECM_MINOR_VERSION 2) +set(ECM_MINOR_VERSION 3) set(ECM_PATCH_VERSION 0) set(ECM_VERSION ${ECM_MAJOR_VERSION}.${ECM_MINOR_VERSION}.${ECM_PATCH_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/docs/find-module/FindLibGit2.rst new/extra-cmake-modules-1.3.0/docs/find-module/FindLibGit2.rst --- old/extra-cmake-modules-1.2.0/docs/find-module/FindLibGit2.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.3.0/docs/find-module/FindLibGit2.rst 2014-10-03 22:53:30.000000000 +0200 @@ -0,0 +1 @@ +.. ecm-module:: ../../find-modules/FindLibGit2.cmake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/find-modules/FindLibGit2.cmake new/extra-cmake-modules-1.3.0/find-modules/FindLibGit2.cmake --- old/extra-cmake-modules-1.2.0/find-modules/FindLibGit2.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.3.0/find-modules/FindLibGit2.cmake 2014-10-03 22:53:30.000000000 +0200 @@ -0,0 +1,133 @@ +#.rst: +# FindLibGit2 +# ------- +# +# Try to find libgit2 on a Unix system. +# +# This will define the following variables: +# +# ``LIBGIT2_FOUND`` +# True if (the requested version of) libgit2 is available +# ``LIBGIT2_VERSION`` +# The version of libgit2 +# ``LIBGIT2_LIBRARIES`` +# This can be passed to target_link_libraries() instead of the ``LibGit2::LibGit2`` +# target +# ``LIBGIT2_INCLUDE_DIRS`` +# This should be passed to target_include_directories() if the target is not +# used for linking +# ``LIBGIT2_DEFINITIONS`` +# This should be passed to target_compile_options() if the target is not +# used for linking +# +# If ``LIBGIT2_FOUND`` is TRUE, it will also define the following imported target: +# +# ``LibGit2::LibGit2`` +# The libgit2 library +# +# In general we recommend using the imported target, as it is easier to use. +# Bear in mind, however, that if the target is in the link interface of an +# exported library, it must be made available by the package config file. + +#============================================================================= +# Copyright 2014 Alex Merry <alex.merry(a)kde.org> +# Copyright 2014 Martin Gräßlin <mgraesslin(a)kde.org> +# Copyright 2014 Christoph Cullmann <cullmann(a)kde.org> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= + +if(CMAKE_VERSION VERSION_LESS 2.8.12) + message(FATAL_ERROR "CMake 2.8.12 is required by FindLibGit2.cmake") +endif() +if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12) + message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindLibGit2.cmake") +endif() + +# Use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls +find_package(PkgConfig) +pkg_check_modules(PKG_GIT2 QUIET git2) + +set(LIBGIT2_DEFINITIONS ${PKG_GIT2_CFLAGS_OTHER}) + +find_path(LIBGIT2_INCLUDE_DIR + NAMES + git2.h + HINTS + ${PKG_GIT2_INCLUDE_DIRS} +) +find_library(LIBGIT2_LIBRARY + NAMES + git2 + HINTS + ${PKG_GIT2_LIBRARY_DIRS} +) + +# get version from header, should work on windows, too +if(LIBGIT2_INCLUDE_DIR) + file(STRINGS "${LIBGIT2_INCLUDE_DIR}/git2/version.h" LIBGIT2_H REGEX "^#define LIBGIT2_VERSION \"[^\"]*\"$") + + string(REGEX REPLACE "^.*LIBGIT2_VERSION \"([0-9]+).*$" "\\1" LIBGIT2_VERSION_MAJOR "${LIBGIT2_H}") + string(REGEX REPLACE "^.*LIBGIT2_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" LIBGIT2_VERSION_MINOR "${LIBGIT2_H}") + string(REGEX REPLACE "^.*LIBGIT2_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" LIBGIT2_VERSION_PATCH "${LIBGIT2_H}") + set(LIBGIT2_VERSION "${LIBGIT2_VERSION_MAJOR}.${LIBGIT2_VERSION_MINOR}.${LIBGIT2_VERSION_PATCH}") + + set(LIBGIT2_MAJOR_VERSION "${LIBGIT2_VERSION_MAJOR}") + set(LIBGIT2_MINOR_VERSION "${LIBGIT2_VERSION_MINOR}") + set(LIBGIT2_PATCH_VERSION "${LIBGIT2_VERSION_PATCH}") + + unset(LIBGIT2_H) +endif() + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LibGit2 + FOUND_VAR + LIBGIT2_FOUND + REQUIRED_VARS + LIBGIT2_LIBRARY + LIBGIT2_INCLUDE_DIR + VERSION_VAR + LIBGIT2_VERSION +) + +if(LIBGIT2_FOUND AND NOT TARGET LibGit2::LibGit2) + add_library(LibGit2::LibGit2 UNKNOWN IMPORTED) + set_target_properties(LibGit2::LibGit2 PROPERTIES + IMPORTED_LOCATION "${LIBGIT2_LIBRARY}" + INTERFACE_COMPILE_OPTIONS "${LIBGIT2_DEFINITIONS}" + INTERFACE_INCLUDE_DIRECTORIES "${LIBGIT2_INCLUDE_DIR}" + ) +endif() + +mark_as_advanced(LIBGIT2_LIBRARY LIBGIT2_INCLUDE_DIR) + +set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARY}) +set(LIBGIT2_INCLUDE_DIRS ${LIBGIT2_INCLUDE_DIR}) + +include(FeatureSummary) +set_package_properties(LibGit2 PROPERTIES + URL "https://libgit2.github.com/" + DESCRIPTION "A plain C library to interface with the git version control system." +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/kde-modules/KDECompilerSettings.cmake new/extra-cmake-modules-1.3.0/kde-modules/KDECompilerSettings.cmake --- old/extra-cmake-modules-1.2.0/kde-modules/KDECompilerSettings.cmake 2014-09-06 00:20:45.000000000 +0200 +++ new/extra-cmake-modules-1.3.0/kde-modules/KDECompilerSettings.cmake 2014-10-03 22:53:30.000000000 +0200 @@ -420,3 +420,6 @@ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--export-all-symbols") endif() +include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake") +include("${ECM_MODULE_DIR}/ECMCoverageOption.cmake") + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/kde-modules/KDEInstallDirs.cmake new/extra-cmake-modules-1.3.0/kde-modules/KDEInstallDirs.cmake --- old/extra-cmake-modules-1.2.0/kde-modules/KDEInstallDirs.cmake 2014-09-06 00:20:45.000000000 +0200 +++ new/extra-cmake-modules-1.3.0/kde-modules/KDEInstallDirs.cmake 2014-10-03 22:53:30.000000000 +0200 @@ -324,7 +324,7 @@ option (KDE_INSTALL_USE_QT_SYS_PATHS "Install mkspecs files, Plugins and Imports to the Qt 5 install dir") if(KDE_INSTALL_USE_QT_SYS_PATHS) # Qt-specific vars - include(ECMQueryQmake) + include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") query_qmake(qt_plugins_dir QT_INSTALL_PLUGINS) @@ -334,10 +334,15 @@ query_qmake(qt_imports_dir QT_INSTALL_IMPORTS) - _define_absolute(QTQUICKIMPORTSDIR QTPLUGINDIR ${qt_imports_dir} + _define_absolute(QTQUICKIMPORTSDIR ${qt_imports_dir} "QtQuick1 imports" IMPORTS_INSTALL_DIR) + query_qmake(qt_qml_dir QT_INSTALL_QML) + + _define_absolute(QMLDIR ${qt_qml_dir} + "QtQuick2 imports" + QML_INSTALL_DIR) else() _define_relative(QTPLUGINDIR LIBDIR "plugins" "Qt plugins" @@ -346,16 +351,16 @@ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" "QtQuick1 imports" IMPORTS_INSTALL_DIR) + + _define_relative(QMLDIR LIBDIR "qml" + "QtQuick2 imports" + QML_INSTALL_DIR) endif() _define_relative(PLUGINDIR QTPLUGINDIR "" "Plugins" PLUGIN_INSTALL_DIR) -_define_relative(QMLDIR LIBDIR "qml" - "QtQuick2 imports" - QML_INSTALL_DIR) - _define_absolute(INCLUDEDIR "include" "C and C++ header files" INCLUDE_INSTALL_DIR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/modules/ECMCoverageOption.cmake new/extra-cmake-modules-1.3.0/modules/ECMCoverageOption.cmake --- old/extra-cmake-modules-1.2.0/modules/ECMCoverageOption.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.3.0/modules/ECMCoverageOption.cmake 2014-10-03 22:53:30.000000000 +0200 @@ -0,0 +1,36 @@ +#.rst: +# ECMCoverageOption +# -------------------- +# +# Creates a BUILD_COVERAGE option, so the project can be built with code coverage +# support. +# +# :: +# +# BUILD_COVERAGE +# +# If it's on, the project will be compiled with code coverage support, using +# gcov. Otherwise, it will be built normally. +# +# :: +# +# +#============================================================================= +# Copyright 2014 Aleix Pol Gonzalez <aleixpol(a)kde.org> +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file COPYING-CMAKE-SCRIPTS for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of extra-cmake-modules, substitute the full +# License text for the above reference.) + +option(BUILD_COVERAGE "Build the project with gcov support" OFF) + +if(BUILD_COVERAGE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov") +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/modules/ECMEnableSanitizers.cmake new/extra-cmake-modules-1.3.0/modules/ECMEnableSanitizers.cmake --- old/extra-cmake-modules-1.2.0/modules/ECMEnableSanitizers.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.3.0/modules/ECMEnableSanitizers.cmake 2014-10-03 22:53:30.000000000 +0200 @@ -0,0 +1,140 @@ +#.rst: +# ECMEnableSanitizers +# ------------------- +# +# Enable compiler sanitizer flags +# +# The following sanitizers are supported : +# - Address Sanitizer +# - Memory Sanitizer +# - Thread Sanitizer +# - Leak Sanitizer +# - Undefined Behaviour Sanitizer +# +# All of them are implemented in Clang, depending on your version, and +# there is an work in progress in GCC, where some of them are currently +# implemented. +# This module will check your current compiler version to see if it support +# the sanitizers that you want to enable +# +# How to use it ? +# --------------- +# This module is included in KDECompilerSettings. Therefore you don't have +# to change your CMakeLists.txt +# +# It introduce a new cached variable : +# ECM_ENABLE_SANITIZERS +# +# which can take the following values : +# - address +# - memory +# - thread +# - leak +# - undefined +# +# You can enable two sanitizers in the same build, depending on their +# compatibility by separating each one with a semicolon : +# ECM_ENABLE_SANITIZERS='address;undefined' +# +# +# The sanitizers `address`, `memory` and `thread` are mutually exclusive. +# You cannot enable two of them in the same build. +# +# `undefined` can be used with every other sanitizers +# +# `leak` can be enable with the `address` sanitizer. +# +# Finally, to reduce the overhead induced by the instrumentation of the +# sanitizers, it is advised to use -O1, or higher to improve the performances. +# +# Example +# ------- +# This is an example of usage : +# mkdir _build +# cd _build +# cmake -DECM_ENABLE_SANITIZERS='address' .. +# +# If you want to use multiple sanitizers +# +# cmake -DECM_ENABLE_SANITIZERS='address;leak;undefined' .. +# +# => Most of the sanitizers will require Clang. To enable it, use : +# -DCMAKE_CXX_COMPILER=clang++ +# +#============================================================================= +# Copyright 2014 Mathieu Tarral <mathieu.tarral(a)gmail.com> +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file COPYING-CMAKE-SCRIPTS for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of extra-cmake-modules, substitute the full +# License text for the above reference.) + +# MACRO check_compiler_version +#----------------------------- +macro (check_compiler_version gcc_required_version clang_required_version) + if ( + ( + CMAKE_CXX_COMPILER_ID MATCHES "GNU" + AND + CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${gcc_required_version} + ) + OR + ( + CMAKE_CXX_COMPILER_ID MATCHES "Clang" + AND + CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${clang_required_version} + ) + ) + # error ! + message(FATAL_ERROR "You ask to enable the sanitizer ${CUR_SANITIZER}, + but your compiler ${CMAKE_CXX_COMPILER_ID} version ${CMAKE_CXX_COMPILER_VERSION} + does not support it ! + You should use at least GCC ${gcc_required_version} or Clang ${clang_required_version} + (99.99 means not implemented yet)") + endif () +endmacro () + +# MACRO check_compiler_support +#------------------------------ +macro (enable_sanitizer_flags sanitize_option) + if (${sanitize_option} MATCHES "address") + check_compiler_version("4.8" "3.1") + set(XSAN_COMPILE_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls") + set(XSAN_LINKER_FLAGS "asan") + elseif (${sanitize_option} MATCHES "thread") + check_compiler_version("4.8" "3.1") + set(XSAN_COMPILE_FLAGS "-fsanitize=thread") + set(XSAN_LINKER_FLAGS "tsan") + elseif (${sanitize_option} MATCHES "memory") + check_compiler_version("99.99" "3.1") + set(XSAN_COMPILE_FLAGS "-fsanitize=memory") + elseif (${sanitize_option} MATCHES "leak") + check_compiler_version("4.9" "3.4") + set(XSAN_COMPILE_FLAGS "-fsanitize=leak") + set(XSAN_LINKER_FLAGS "lsan") + elseif (${sanitize_option} MATCHES "undefined") + check_compiler_version("99.99" "3.1") + set(XSAN_COMPILE_FLAGS "-fsanitize=undefined -fno-omit-frame-pointer -fno-optimize-sibling-calls") + else () + message(FATAL_ERROR "Compiler sanitizer option \"${sanitize_option}\" not supported.") + endif () +endmacro () + +# for each element of the ECM_ENABLE_SANITIZERS list +foreach ( CUR_SANITIZER ${ECM_ENABLE_SANITIZERS} ) + # lowercase filter + string(TOLOWER ${CUR_SANITIZER} CUR_SANITIZER) + # check option and enable appropriate flags + enable_sanitizer_flags ( ${CUR_SANITIZER} ) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${XSAN_COMPILE_FLAGS}" ) + link_libraries(${XSAN_LINKER_FLAGS}) + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + string(REPLACE "-Wl,--no-undefined" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") + string(REPLACE "-Wl,--no-undefined" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}") + endif () +endforeach () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/modules/ECMGeneratePkgConfigFile.cmake new/extra-cmake-modules-1.3.0/modules/ECMGeneratePkgConfigFile.cmake --- old/extra-cmake-modules-1.2.0/modules/ECMGeneratePkgConfigFile.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.3.0/modules/ECMGeneratePkgConfigFile.cmake 2014-10-03 22:53:30.000000000 +0200 @@ -0,0 +1,156 @@ +#.rst: +# ECMGeneratePkgConfigFile +# ------------------ +# +# Generate a ``.pc`` file for the benefit of autotools-based projects. +# +# :: +# +# ecm_generate_pkgconfig_file(BASE_NAME <baseName> +# [LIB_NAME <libName>] +# [DEPS "<dep> [<dep> [...]]"] +# [FILENAME_VAR <filename_variable>] +# [INCLUDE_INSTALL_DIR <dir>] +# [LIB_INSTALL_DIR <dir>] +# [DEFINES -D<variable=value>...] +# [INSTALL]) +# +# BASE_NAME is the name of the module. It's the name projects will use to find +# the module. +# +# LIB_NAME is the name of the library that is being exported. If undefined, it +# will default to the BASE_NAME. That means the LIB_NAME will be set as the name +# field as well as the library to link to. +# +# FILENAME_VAR is specified with a variable name. This variable will receive the +# location of the generated file will be set, within the build directory. This +# way it can be used in case some processing is required. See also INSTALL. +# +# INCLUDE_INSTALL_DIR specifies where the includes will be installed. If it's not +# specified, it will default to INSTALL_INCLUDEDIR, CMAKE_INSTALL_INCLUDEDIR or just +# "include/" in case they are specified, with the BASE_NAME postfixed. +# +# LIB_INSTALL_DIR specifies where the library is being installed. If it's not +# specified, it will default to LIB_INSTALL_DIR, CMAKE_INSTALL_LIBDIR or just +# "lib/" in case they are specified. +# +# DEFINES is a list of preprocessor defines that it is recommended users of the +# library pass to the compiler when using it. +# +# INSTALL will cause the module to be installed to the ``pkgconfig`` subdirectory +# of LIB_INSTALL_DIR, unless the ECM_PKGCONFIG_INSTALL_DIR cache variable is set +# to something different. Note that the first call to ecm_generate_pkgconfig_file +# with the INSTALL argument will cause ECM_PKGCONFIG_INSTALL_DIR to be set to the +# cache, and will be used in any subsequent calls. +# +# To properly use this macro a version needs to be set. To retrieve it ``ECM_PKGCONFIG_INSTALL_DIR`` +# uses PROJECT_VERSION. To set it, use the project() command (only available since CMake 3.0) or the +# ecm_setup_version() macro. +# +# +# Example usage: +# +# .. code-block:: cmake +# +# ecm_generate_pkgconfig_file( +# BASE_NAME KF5Archive +# DEPS Qt5Core +# FILENAME_VAR pkgconfig_filename +# INSTALL +# ) +# + +#============================================================================= +# Copyright 2014 Aleix Pol Gonzalez <aleixpol(a)kde.org> +# Copyright 2014 David Faure <faure(a)kde.org> +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file COPYING-CMAKE-SCRIPTS for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of extra-cmake-modules, substitute the full +# License text for the above reference.) + +function(ECM_GENERATE_PKGCONFIG_FILE) + set(options INSTALL) + set(oneValueArgs BASE_NAME LIB_NAME FILENAME_VAR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR) + set(multiValueArgs DEPS DEFINES) + + cmake_parse_arguments(EGPF "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + + if(EGPF_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Unknown keywords given to ECM_GENERATE_PKGCONFIG_FILE(): \"${EGPF_UNPARSED_ARGUMENTS}\"") + endif() + + if(NOT EGPF_BASE_NAME) + message(FATAL_ERROR "Required argument BASE_NAME missing in ECM_GENERATE_PKGCONFIG_FILE() call") + endif() + if(NOT PROJECT_VERSION) + message(FATAL_ERROR "Required variable PROJECT_VERSION not set before ECM_GENERATE_PKGCONFIG_FILE() call. Did you call ecm_setup_version or project with the VERSION argument?") + endif() + if(NOT EGPF_LIB_NAME) + set(EGPF_LIB_NAME ${EGPF_BASE_NAME}) + endif() + if(NOT EGPF_INCLUDE_INSTALL_DIR) + if(INCLUDE_INSTALL_DIR) + set(EGPF_INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}/${EGPF_BASE_NAME}") + elseif(CMAKE_INSTALL_INCLUDEDIR) + set(EGPF_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${EGPF_BASE_NAME}") + else() + set(EGPF_INCLUDE_INSTALL_DIR "include/${EGPF_BASE_NAME}") + endif() + endif() + if(NOT EGPF_LIB_INSTALL_DIR) + if(LIB_INSTALL_DIR) + set(EGPF_LIB_INSTALL_DIR "${LIB_INSTALL_DIR}") + elseif(CMAKE_INSTALL_LIBDIR) + set(EGPF_LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") + else() + set(EGPF_LIB_INSTALL_DIR "lib") + endif() + endif() + + set(PKGCONFIG_TARGET_BASENAME ${EGPF_BASE_NAME}) + set(PKGCONFIG_TARGET_LIBNAME ${EGPF_LIB_NAME}) + if (DEFINED EGPF_DEPS) + string(REPLACE ";" " " PKGCONFIG_TARGET_DEPS "${EGPF_DEPS}") + endif () + if(IS_ABSOLUTE "${EGPF_INCLUDE_INSTALL_DIR}") + set(PKGCONFIG_TARGET_INCLUDES "-I${EGPF_INCLUDE_INSTALL_DIR}") + else() + set(PKGCONFIG_TARGET_INCLUDES "-I${CMAKE_INSTALL_PREFIX}/${EGPF_INCLUDE_INSTALL_DIR}") + endif() + if(IS_ABSOLUTE "${EGPF_LIB_INSTALL_DIR}") + set(PKGCONFIG_TARGET_LIBS "${EGPF_LIB_INSTALL_DIR}") + else() + set(PKGCONFIG_TARGET_LIBS "${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR}") + endif() + set(PKGCONFIG_TARGET_DEFINES "") + if(EGPF_DEFINES) + set(PKGCONFIG_TARGET_DEFINES "${EGPF_DEFINE}") + endif() + + set(PKGCONFIG_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_TARGET_BASENAME}.pc) + if (EGPF_FILENAME_VAR) + set(${EGPF_FILENAME_VAR} ${PKGCONFIG_FILENAME} PARENT_SCOPE) + endif() + + file(WRITE ${PKGCONFIG_FILENAME} +" +Name: @PKGCONFIG_TARGET_LIBNAME@ +Version: @PROJECT_VERSION@ +Libs: -L@CMAKE_INSTALL_PREFIX@/@EGPF_LIB_INSTALL_DIR@ -l@PKGCONFIG_TARGET_LIBNAME@ +Cflags: @PKGCONFIG_TARGET_INCLUDES@ @PKGCONFIG_TARGET_DEFINES@ +Requires: @PKGCONFIG_TARGET_DEPS@ +" + ) + + if(EGPF_INSTALL) + set(ECM_PKGCONFIG_INSTALL_DIR "${EGPF_LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.") + install(FILES ${PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR}) + endif() +endfunction() + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/modules/ECMQueryQmake.cmake new/extra-cmake-modules-1.3.0/modules/ECMQueryQmake.cmake --- old/extra-cmake-modules-1.2.0/modules/ECMQueryQmake.cmake 2014-09-06 00:20:45.000000000 +0200 +++ new/extra-cmake-modules-1.3.0/modules/ECMQueryQmake.cmake 2014-10-03 22:53:30.000000000 +0200 @@ -6,10 +6,18 @@ set(QMAKE_EXECUTABLE "qmake-qt5" CACHE) endif() -function(QUERY_QMAKE RESULT VAR) - exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output ) - if(NOT return_code) - file(TO_CMAKE_PATH "${output}" output) - set(${RESULT} ${output} PARENT_SCOPE) +# This is not public API (yet)! +function(query_qmake result_variable qt_variable) + execute_process( + COMMAND ${QMAKE_EXECUTABLE} -query "${qt_variable}" + RESULT_VARIABLE return_code + OUTPUT_VARIABLE output + ) + string(STRIP ${output} output) + if(return_code EQUAL 0) + file(TO_CMAKE_PATH "${output}" output_path) + set(${result_variable} "${output_path}" PARENT_SCOPE) + else() + message(FATAL "QMake call failed: ${error}") endif() -endfunction(QUERY_QMAKE) +endfunction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/tests/CMakeLists.txt new/extra-cmake-modules-1.3.0/tests/CMakeLists.txt --- old/extra-cmake-modules-1.2.0/tests/CMakeLists.txt 2014-09-06 00:20:45.000000000 +0200 +++ new/extra-cmake-modules-1.3.0/tests/CMakeLists.txt 2014-10-03 22:53:30.000000000 +0200 @@ -6,6 +6,7 @@ add_subdirectory(ECMGenerateHeadersTest) add_subdirectory(ECMSetupVersionTest) +add_subdirectory(ECMGeneratePkgConfigFile) # a macro for tests that have a simple format where the name matches the # directory and project @@ -28,8 +29,16 @@ add_test_macro(ExecuteCoreModules dummy) add_test_macro(ExecuteKDEModules dummy) + add_test_macro(KDEInstallDirsTest.vars_defined dummy) add_test_macro(KDEInstallDirsTest.not_cache_variable dummy) +find_package(Qt5Core QUIET) +if (TARGET Qt5::qmake) + set(KDEInstallDirsTest.qt_vars_defined_EXTRA_OPTIONS + --build-options -DKDE_INSTALL_USE_QT_SYS_PATHS=ON) + add_test_macro(KDEInstallDirsTest.qt_vars_defined dummy) +endif () + add_test_macro(FindModules dummy) add_test_macro(UseFindModules dummy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/tests/ECMGeneratePkgConfigFile/CMakeLists.txt new/extra-cmake-modules-1.3.0/tests/ECMGeneratePkgConfigFile/CMakeLists.txt --- old/extra-cmake-modules-1.2.0/tests/ECMGeneratePkgConfigFile/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.3.0/tests/ECMGeneratePkgConfigFile/CMakeLists.txt 2014-10-03 22:53:30.000000000 +0200 @@ -0,0 +1,6 @@ +set(MODULES_DIR "${extra-cmake-modules_SOURCE_DIR}/modules") +configure_file(run_test.cmake.config "${CMAKE_CURRENT_BINARY_DIR}/run_test.cmake" @ONLY) + +add_test( + NAME ECMGenerateHeaders + COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_BINARY_DIR}/run_test.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc new/extra-cmake-modules-1.3.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc --- old/extra-cmake-modules-1.2.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.3.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc 2014-10-03 22:53:30.000000000 +0200 @@ -0,0 +1,6 @@ + +Name: KF5CoreAddons +Version: 5.43 +Libs: -L/usr/lib -lKF5CoreAddons +Cflags: -I/usr/KCoreAddons +Requires: Qt5Core diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config new/extra-cmake-modules-1.3.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config --- old/extra-cmake-modules-1.2.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.3.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config 2014-10-03 22:53:30.000000000 +0200 @@ -0,0 +1,54 @@ +set(CMAKE_MODULE_PATH "@MODULES_DIR@") +set(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@") +set(CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@") + +set(CMAKE_INSTALL_PREFIX "/usr") + +include(ECMGeneratePkgConfigFile) +include(ECMSetupVersion) +include(CMakeParseArguments) + + +function (compare_files) + set(options) + set(oneValueArgs GENERATED ORIGINALS) + set(multiValueArgs) + cmake_parse_arguments(CF "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + list(LENGTH CF_GENERATED count) + foreach(i RANGE ${count}) + list(GET CF_GENERATED 0 generated_file) + if (NOT EXISTS "${generated_file}") + message(FATAL_ERROR "${generated_file} was not generated") + endif() + file(READ "${generated_file}" file_contents) + string(STRIP "${file_contents}" file_contents) + + list(GET CF_ORIGINALS 0 original_file) + if (NOT EXISTS "${original_file}") + message(FATAL_ERROR "Original ${original_file} was not found") + endif() + file(READ "${original_file}" original_contents) + string(STRIP "${original_contents}" original_contents) + + if(NOT original_contents STREQUAL file_contents) + message(FATAL_ERROR "Different files: ${original_file} ${generated_file}") + endif() + endforeach() +endfunction() + +########################################################### + + +ecm_setup_version(5.43 VARIABLE_PREFIX KCOREADDONS + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5CoreAddonsConfigVersion.cmake" + SOVERSION 5) + +message(STATUS "Test 1: no optional arguments") +set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddons.pc") + +ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons DEPS Qt5Core INCLUDE_INSTALL_DIR /usr/KCoreAddons FILENAME_VAR OutputFile) + +compare_files(GENERATED ${OutputFile} + ORIGINALS ${origfiles}) +file(REMOVE ${OutputFile}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/tests/ExecuteKDEModules/CMakeLists.txt new/extra-cmake-modules-1.3.0/tests/ExecuteKDEModules/CMakeLists.txt --- old/extra-cmake-modules-1.2.0/tests/ExecuteKDEModules/CMakeLists.txt 2014-09-06 00:20:45.000000000 +0200 +++ new/extra-cmake-modules-1.3.0/tests/ExecuteKDEModules/CMakeLists.txt 2014-10-03 22:53:30.000000000 +0200 @@ -9,7 +9,9 @@ KDEFrameworkCompilerSettings ) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../kde-modules) +set(ECM_KDE_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../kde-modules) +set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../modules) +set(CMAKE_MODULE_PATH "${ECM_KDE_MODULE_DIR}") foreach(module ${all_kde_modules}) message(STATUS "module: ${module}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/tests/KDEInstallDirsTest/not_cache_variable/CMakeLists.txt new/extra-cmake-modules-1.3.0/tests/KDEInstallDirsTest/not_cache_variable/CMakeLists.txt --- old/extra-cmake-modules-1.2.0/tests/KDEInstallDirsTest/not_cache_variable/CMakeLists.txt 2014-09-06 00:20:45.000000000 +0200 +++ new/extra-cmake-modules-1.3.0/tests/KDEInstallDirsTest/not_cache_variable/CMakeLists.txt 2014-10-03 22:53:30.000000000 +0200 @@ -1,10 +1,12 @@ # Test KDEInstallDirs does not crash if a variable like CMAKE_INSTALL_LIBDIR is # defined but is not a cache variable. cmake_minimum_required(VERSION 2.8) -set(kde_modules_dir ${CMAKE_SOURCE_DIR}/../../../kde-modules) + +set(ECM_KDE_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../kde-modules) +set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) set(CMAKE_INSTALL_LIBDIR "foo") -include(${kde_modules_dir}/KDEInstallDirs.cmake) +include(${ECM_KDE_MODULE_DIR}/KDEInstallDirs.cmake) add_executable(dummy main.c) set_target_properties(dummy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt new/extra-cmake-modules-1.3.0/tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt --- old/extra-cmake-modules-1.2.0/tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.3.0/tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt 2014-10-03 22:53:30.000000000 +0200 @@ -0,0 +1,177 @@ +project(KDEInstallDirs.vars_defined) +cmake_minimum_required(VERSION 2.8.12) + +set(ECM_KDE_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../kde-modules) +set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) +set(CMAKE_MODULE_PATH "${ECM_KDE_MODULE_DIR}") +include(KDEInstallDirs) + +set(misc_vars + CMAKE_INSTALL_DEFAULT_COMPONENT_NAME + INSTALL_TARGETS_DEFAULT_ARGS + KF5_INSTALL_TARGETS_DEFAULT_ARGS +) + +set(relative_path_vars + # old-style variables + AUTOSTART_INSTALL_DIR + BIN_INSTALL_DIR + CMAKECONFIG_INSTALL_PREFIX + CONFIG_INSTALL_DIR + DATA_INSTALL_DIR + DBUS_INTERFACES_INSTALL_DIR + DBUS_SERVICES_INSTALL_DIR + DBUS_SYSTEM_SERVICES_INSTALL_DIR + EXEC_INSTALL_PREFIX + HTML_INSTALL_DIR + ICON_INSTALL_DIR + INCLUDE_INSTALL_DIR + KCFG_INSTALL_DIR + KCONF_UPDATE_INSTALL_DIR + KF5_DATA_INSTALL_DIR + KF5_INCLUDE_INSTALL_DIR + KF5_LIBEXEC_INSTALL_DIR + KNOTIFYRC_INSTALL_DIR + KXMLGUI_INSTALL_DIR + LIBEXEC_INSTALL_DIR + LIB_INSTALL_DIR + LOCALE_INSTALL_DIR + MAN_INSTALL_DIR + SBIN_INSTALL_DIR + SERVICES_INSTALL_DIR + SERVICETYPES_INSTALL_DIR + SHARE_INSTALL_PREFIX + SOUND_INSTALL_DIR + SYSCONF_INSTALL_DIR + TEMPLATES_INSTALL_DIR + WALLPAPER_INSTALL_DIR + XDG_APPS_INSTALL_DIR + XDG_DIRECTORY_INSTALL_DIR + XDG_MIME_INSTALL_DIR + + # new-style variables + CMAKE_INSTALL_APPDIR + CMAKE_INSTALL_AUTOSTARTDIR + CMAKE_INSTALL_BINDIR + CMAKE_INSTALL_CMAKEPACKAGEDIR + CMAKE_INSTALL_CONFDIR + CMAKE_INSTALL_DATADIR + CMAKE_INSTALL_DATADIR_KF5 + CMAKE_INSTALL_DATAROOTDIR + CMAKE_INSTALL_DBUSDIR + CMAKE_INSTALL_DBUSINTERFACEDIR + CMAKE_INSTALL_DBUSSERVICEDIR + CMAKE_INSTALL_DBUSSYSTEMSERVICEDIR + CMAKE_INSTALL_DESKTOPDIR + CMAKE_INSTALL_DOCBUNDLEDIR + CMAKE_INSTALL_EXECROOTDIR + CMAKE_INSTALL_ICONDIR + CMAKE_INSTALL_INCLUDEDIR + CMAKE_INSTALL_INCLUDEDIR_KF5 + CMAKE_INSTALL_INFODIR + CMAKE_INSTALL_KCFGDIR + CMAKE_INSTALL_KCONFUPDATEDIR + CMAKE_INSTALL_KNOTIFY5RCDIR + CMAKE_INSTALL_KXMLGUI5DIR + CMAKE_INSTALL_KSERVICES5DIR + CMAKE_INSTALL_KSERVICETYPES5DIR + CMAKE_INSTALL_LIBDIR + CMAKE_INSTALL_LIBEXECDIR + CMAKE_INSTALL_LIBEXECDIR_KF5 + CMAKE_INSTALL_LOCALEDIR + CMAKE_INSTALL_LOCALSTATEDIR + CMAKE_INSTALL_MANDIR + CMAKE_INSTALL_MIMEDIR + CMAKE_INSTALL_METAINFODIR + CMAKE_INSTALL_SBINDIR + CMAKE_INSTALL_SHAREDSTATEDIR + CMAKE_INSTALL_SOUNDDIR + CMAKE_INSTALL_SYSCONFDIR + CMAKE_INSTALL_TEMPLATEDIR + CMAKE_INSTALL_WALLPAPERDIR +) + +set(absolute_path_vars + IMPORTS_INSTALL_DIR + PLUGIN_INSTALL_DIR + QML_INSTALL_DIR + QT_PLUGIN_INSTALL_DIR + + CMAKE_INSTALL_PLUGINDIR + CMAKE_INSTALL_QMLDIR + CMAKE_INSTALL_QTPLUGINDIR + CMAKE_INSTALL_QTQUICKIMPORTSDIR + + CMAKE_INSTALL_FULL_APPDIR + CMAKE_INSTALL_FULL_AUTOSTARTDIR + CMAKE_INSTALL_FULL_BINDIR + CMAKE_INSTALL_FULL_CMAKEPACKAGEDIR + CMAKE_INSTALL_FULL_CONFDIR + CMAKE_INSTALL_FULL_DATADIR + CMAKE_INSTALL_FULL_DATADIR_KF5 + CMAKE_INSTALL_FULL_DATAROOTDIR + CMAKE_INSTALL_FULL_DBUSDIR + CMAKE_INSTALL_FULL_DBUSINTERFACEDIR + CMAKE_INSTALL_FULL_DBUSSERVICEDIR + CMAKE_INSTALL_FULL_DBUSSYSTEMSERVICEDIR + CMAKE_INSTALL_FULL_DESKTOPDIR + CMAKE_INSTALL_FULL_DOCBUNDLEDIR + CMAKE_INSTALL_FULL_EXECROOTDIR + CMAKE_INSTALL_FULL_ICONDIR + CMAKE_INSTALL_FULL_INCLUDEDIR + CMAKE_INSTALL_FULL_INCLUDEDIR_KF5 + CMAKE_INSTALL_FULL_INFODIR + CMAKE_INSTALL_FULL_KCFGDIR + CMAKE_INSTALL_FULL_KCONFUPDATEDIR + CMAKE_INSTALL_FULL_KNOTIFY5RCDIR + CMAKE_INSTALL_FULL_KXMLGUI5DIR + CMAKE_INSTALL_FULL_KSERVICES5DIR + CMAKE_INSTALL_FULL_KSERVICETYPES5DIR + CMAKE_INSTALL_FULL_LIBDIR + CMAKE_INSTALL_FULL_LIBEXECDIR + CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 + CMAKE_INSTALL_FULL_LOCALEDIR + CMAKE_INSTALL_FULL_LOCALSTATEDIR + CMAKE_INSTALL_FULL_MANDIR + CMAKE_INSTALL_FULL_MIMEDIR + CMAKE_INSTALL_FULL_METAINFODIR + CMAKE_INSTALL_FULL_PLUGINDIR + CMAKE_INSTALL_FULL_QMLDIR + CMAKE_INSTALL_FULL_QTPLUGINDIR + CMAKE_INSTALL_FULL_QTQUICKIMPORTSDIR + CMAKE_INSTALL_FULL_SBINDIR + CMAKE_INSTALL_FULL_SHAREDSTATEDIR + CMAKE_INSTALL_FULL_SOUNDDIR + CMAKE_INSTALL_FULL_SYSCONFDIR + CMAKE_INSTALL_FULL_TEMPLATEDIR + CMAKE_INSTALL_FULL_WALLPAPERDIR +) +if(APPLE) + # The default bundle directory is an absolute path + list(APPEND absolute_path_vars + BUNDLE_INSTALL_DIR + CMAKE_INSTALL_BUNDLEDIR + CMAKE_INSTALL_FULL_BUNDLEDIR + ) +endif() + +foreach(variable ${misc_vars} ${relative_path_vars} ${absolute_path_vars}) + if(NOT DEFINED ${variable}) + message(SEND_ERROR "${variable} is not defined.") + endif() +endforeach() + +foreach(variable ${relative_path_vars}) + if(IS_ABSOLUTE ${${variable}}) + message(SEND_ERROR "${variable} (${${variable}}) should be a relative path, but is absolute.") + endif() +endforeach() + +foreach(variable ${absolute_path_vars}) + if(NOT IS_ABSOLUTE ${${variable}}) + message(SEND_ERROR "${variable} (${${variable}}) should be an absolute path, but is relative.") + endif() +endforeach() + +add_executable(dummy main.c) +set_target_properties(dummy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/tests/KDEInstallDirsTest/qt_vars_defined/main.c new/extra-cmake-modules-1.3.0/tests/KDEInstallDirsTest/qt_vars_defined/main.c --- old/extra-cmake-modules-1.2.0/tests/KDEInstallDirsTest/qt_vars_defined/main.c 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.3.0/tests/KDEInstallDirsTest/qt_vars_defined/main.c 2014-10-03 22:53:30.000000000 +0200 @@ -0,0 +1,4 @@ +int main() +{ + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.2.0/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt new/extra-cmake-modules-1.3.0/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt --- old/extra-cmake-modules-1.2.0/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt 2014-09-06 00:20:45.000000000 +0200 +++ new/extra-cmake-modules-1.3.0/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt 2014-10-03 22:53:30.000000000 +0200 @@ -1,7 +1,9 @@ project(KDEInstallDirs.vars_defined) cmake_minimum_required(VERSION 2.8.12) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../kde-modules) +set(ECM_KDE_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../kde-modules) +set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) +set(CMAKE_MODULE_PATH "${ECM_KDE_MODULE_DIR}") include(KDEInstallDirs) set(misc_vars -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kross for openSUSE:Factory
by root＠hilbert.suse.de 07 Oct '14

07 Oct '14

Hello community, here is the log from the commit of package kross for openSUSE:Factory checked in at 2014-10-07 16:00:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kross (Old) and /work/SRC/openSUSE:Factory/.kross.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kross" Changes: -------- --- /work/SRC/openSUSE:Factory/kross/kross.changes 2014-09-12 17:05:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kross.new/kross.changes 2014-10-07 16:01:05.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Oct 4 18:00:09 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 5.3.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.3.0.php + +------------------------------------------------------------------- Old: ---- kross-5.2.0.tar.xz New: ---- kross-5.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kross.spec ++++++ --- /var/tmp/diff_new_pack.avlL6z/_old 2014-10-07 16:01:06.000000000 +0200 +++ /var/tmp/diff_new_pack.avlL6z/_new 2014-10-07 16:01:06.000000000 +0200 @@ -17,11 +17,11 @@ Name: kross -Version: 5.2.0 +Version: 5.3.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.2.0 +BuildRequires: extra-cmake-modules >= 1.3.0 BuildRequires: fdupes BuildRequires: kcompletion-devel >= %{kf5_version} BuildRequires: kdoctools-devel >= %{kf5_version} ++++++ kross-5.2.0.tar.xz -> kross-5.3.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.2.0/CMakeLists.txt new/kross-5.3.0/CMakeLists.txt --- old/kross-5.2.0/CMakeLists.txt 2014-09-09 02:35:05.000000000 +0200 +++ new/kross-5.3.0/CMakeLists.txt 2014-10-04 19:11:09.000000000 +0200 @@ -2,7 +2,7 @@ project(Kross) -find_package(ECM 1.2.0 REQUIRED NO_MODULE) +find_package(ECM 1.3.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -16,8 +16,8 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "5.2.0") # handled by release scripts -set(KF5_DEP_VERSION "5.2.0") # handled by release scripts +set(KF5_VERSION "5.3.0") # handled by release scripts +set(KF5_DEP_VERSION "5.3.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KROSS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kross_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KrossConfigVersion.cmake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.2.0/po/ja/kross5.po new/kross-5.3.0/po/ja/kross5.po --- old/kross-5.2.0/po/ja/kross5.po 2014-09-09 02:35:05.000000000 +0200 +++ new/kross-5.3.0/po/ja/kross5.po 2014-10-04 19:11:09.000000000 +0200 @@ -16,7 +16,7 @@ "POT-Creation-Date: 2014-05-14 08:06+0000\n" "PO-Revision-Date: 2011-08-27 14:05-0700\n" "Last-Translator: Fumiaki Okushi <okushi(a)kde.gr.jp>\n" -"Language-Team: Japanese <Kdeveloper(a)kde.gr.jp>\n" +"Language-Team: Japanese <kde-jp(a)kde.org>\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.2.0/po/nds/kross5.po new/kross-5.3.0/po/nds/kross5.po --- old/kross-5.2.0/po/nds/kross5.po 2014-09-09 02:35:05.000000000 +0200 +++ new/kross-5.3.0/po/nds/kross5.po 2014-10-04 19:11:09.000000000 +0200 @@ -16,7 +16,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" msgctxt "NAME OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-5.2.0/po/oc/kross5.po new/kross-5.3.0/po/oc/kross5.po --- old/kross-5.2.0/po/oc/kross5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kross-5.3.0/po/oc/kross5.po 2014-10-04 19:11:09.000000000 +0200 @@ -0,0 +1,181 @@ +# translation of kdelibs4.po to Occitan +# Copyright (C) 2008 This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Yannig Marchegay (Kokoyaya) <yannig(a)marchegay.org>, 2007, 2008. +msgid "" +msgstr "" +"Project-Id-Version: kdelibs4\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-05-14 08:06+0000\n" +"PO-Revision-Date: 2008-08-06 00:07+0200\n" +"Last-Translator: \n" +"Language-Team: Occitan <oc(a)li.org>\n" +"Language: oc\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: KBabel 1.11.4\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Yannig Marchegay (Kokoyaya)" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "yannig(a)marchegay.org" + +#: console/main.cpp:99 +msgctxt "application name" +msgid "Kross" +msgstr "" + +#: console/main.cpp:101 +msgctxt "application description" +msgid "Command-line utility to run Kross scripts." +msgstr "" + +#: console/main.cpp:103 +msgctxt "@info:credit" +msgid "Copyright 2006 Sebastian Sauer" +msgstr "" + +#: console/main.cpp:107 +msgctxt "@info:credit" +msgid "Sebastian Sauer" +msgstr "" + +#: console/main.cpp:108 +#, fuzzy +#| msgid "Author" +msgctxt "@info:credit" +msgid "Author" +msgstr "Autor" + +#: console/main.cpp:118 +#, fuzzy +#| msgid "Description" +msgctxt "@info:shell command-line argument" +msgid "The script to run." +msgstr "Descripcion" + +#: core/action.cpp:474 +#, kde-format +msgid "Scriptfile \"%1\" does not exist." +msgstr "" + +#: core/action.cpp:478 +#, kde-format +msgid "Failed to determine interpreter for scriptfile \"%1\"" +msgstr "" + +#: core/action.cpp:482 +#, kde-format +msgid "Failed to open scriptfile \"%1\"" +msgstr "" + +#: core/action.cpp:493 +#, kde-format +msgid "Failed to load interpreter \"%1\"" +msgstr "" + +#: core/action.cpp:495 +#, kde-format +msgid "No such interpreter \"%1\"" +msgstr "" + +#: core/action.cpp:502 +#, kde-format +msgid "Failed to create script for interpreter \"%1\"" +msgstr "" + +#: core/manager.cpp:137 +msgid "Level of safety of the Ruby interpreter" +msgstr "" + +#: modules/form.cpp:328 +#, fuzzy +#| msgid "Cancel" +msgid "Cancel?" +msgstr "Anullar" + +#: qts/values_p.h:75 +#, kde-format +msgid "No such function \"%1\"" +msgstr "" + +#: ui/actioncollectionview.cpp:175 +msgid "Name:" +msgstr "Nom :" + +#: ui/actioncollectionview.cpp:183 +msgid "Text:" +msgstr "Tèxt :" + +#: ui/actioncollectionview.cpp:190 +msgid "Comment:" +msgstr "Comentari :" + +#: ui/actioncollectionview.cpp:197 +msgid "Icon:" +msgstr "Icòna :" + +#: ui/actioncollectionview.cpp:218 +msgid "Interpreter:" +msgstr "" + +#: ui/actioncollectionview.cpp:234 +msgid "File:" +msgstr "Fichièr :" + +#: ui/actioncollectionview.cpp:327 +msgid "Run" +msgstr "Executar" + +#: ui/actioncollectionview.cpp:329 +msgid "Execute the selected script." +msgstr "" + +#: ui/actioncollectionview.cpp:334 +msgid "Stop" +msgstr "Arrestar" + +#: ui/actioncollectionview.cpp:336 +msgid "Stop execution of the selected script." +msgstr "" + +#: ui/actioncollectionview.cpp:341 +msgid "Edit..." +msgstr "Editar..." + +#: ui/actioncollectionview.cpp:343 +msgid "Edit selected script." +msgstr "" + +#: ui/actioncollectionview.cpp:348 +msgid "Add..." +msgstr "Apondre..." + +#: ui/actioncollectionview.cpp:350 +msgid "Add a new script." +msgstr "Apondre un escript novèl." + +#: ui/actioncollectionview.cpp:355 +msgid "Remove" +msgstr "Suprimir" + +#: ui/actioncollectionview.cpp:357 +msgid "Remove selected script." +msgstr "" + +#: ui/actioncollectionview.cpp:550 +msgid "Edit" +msgstr "Edicion" + +#: ui/actioncollectionview.cpp:555 +#, fuzzy +#| msgid "General" +msgctxt "@title:group Script properties" +msgid "General" +msgstr "General" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kitemviews for openSUSE:Factory
by root＠hilbert.suse.de 07 Oct '14

07 Oct '14

Hello community, here is the log from the commit of package kitemviews for openSUSE:Factory checked in at 2014-10-07 16:00:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemviews (Old) and /work/SRC/openSUSE:Factory/.kitemviews.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kitemviews" Changes: -------- --- /work/SRC/openSUSE:Factory/kitemviews/kitemviews.changes 2014-09-12 17:05:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kitemviews.new/kitemviews.changes 2014-10-07 16:01:03.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Oct 4 18:00:09 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 5.3.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.3.0.php + +------------------------------------------------------------------- Old: ---- kitemviews-5.2.0.tar.xz New: ---- kitemviews-5.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemviews.spec ++++++ --- /var/tmp/diff_new_pack.706bgR/_old 2014-10-07 16:01:04.000000000 +0200 +++ /var/tmp/diff_new_pack.706bgR/_new 2014-10-07 16:01:04.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5ItemViews5 Name: kitemviews -Version: 5.2.0 +Version: 5.3.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.2.0 +BuildRequires: extra-cmake-modules >= 1.3.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libqt5-linguist-devel >= 5.2.0 ++++++ kitemviews-5.2.0.tar.xz -> kitemviews-5.3.0.tar.xz ++++++ ++++ 899018 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kglobalaccel for openSUSE:Factory
by root＠hilbert.suse.de 07 Oct '14

07 Oct '14

Hello community, here is the log from the commit of package kglobalaccel for openSUSE:Factory checked in at 2014-10-07 16:00:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old) and /work/SRC/openSUSE:Factory/.kglobalaccel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kglobalaccel" Changes: -------- --- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes 2014-09-12 17:05:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kglobalaccel.new/kglobalaccel.changes 2014-10-07 16:01:00.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Oct 4 18:00:08 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 5.3.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.3.0.php + +------------------------------------------------------------------- Old: ---- kglobalaccel-5.2.0.tar.xz New: ---- kglobalaccel-5.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kglobalaccel.spec ++++++ --- /var/tmp/diff_new_pack.GMjjSZ/_old 2014-10-07 16:01:01.000000000 +0200 +++ /var/tmp/diff_new_pack.GMjjSZ/_new 2014-10-07 16:01:01.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5GlobalAccel5 Name: kglobalaccel -Version: 5.2.0 +Version: 5.3.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.2.0 +BuildRequires: extra-cmake-modules >= 1.3.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libqt5-linguist-devel >= 5.2.0 ++++++ kglobalaccel-5.2.0.tar.xz -> kglobalaccel-5.3.0.tar.xz ++++++ ++++ 900732 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs4support for openSUSE:Factory
by root＠hilbert.suse.de 07 Oct '14

07 Oct '14

Hello community, here is the log from the commit of package kdelibs4support for openSUSE:Factory checked in at 2014-10-07 16:00:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4support (Old) and /work/SRC/openSUSE:Factory/.kdelibs4support.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdelibs4support" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4support/kdelibs4support.changes 2014-09-12 17:05:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs4support.new/kdelibs4support.changes 2014-10-07 16:00:57.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Oct 4 18:00:07 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 5.3.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.3.0.php + +------------------------------------------------------------------- Old: ---- kdelibs4support-5.2.0.tar.xz New: ---- kdelibs4support-5.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4support.spec ++++++ --- /var/tmp/diff_new_pack.7a8isn/_old 2014-10-07 16:00:58.000000000 +0200 +++ /var/tmp/diff_new_pack.7a8isn/_new 2014-10-07 16:00:58.000000000 +0200 @@ -18,11 +18,11 @@ %define lname libKF5KDELibs4Support5 Name: kdelibs4support -Version: 5.2.0 +Version: 5.3.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.2.0 +BuildRequires: extra-cmake-modules >= 1.3.0 BuildRequires: fdupes BuildRequires: kbookmarks-devel >= %{kf5_version} BuildRequires: kcompletion-devel >= %{kf5_version} @@ -60,6 +60,7 @@ BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(x11) +Recommends: %{name}-lang = %{version} Provides: kde4support = %{version} Obsoletes: kde4support < %{version} Summary: Code and utilities to ease the transition to KDE Frameworks 5 @@ -174,6 +175,7 @@ location as KDELibs4Support, although it may be sufficient to set the KDEDIRS environment variable correctly. Development files. +%lang_package %prep %setup -q @@ -185,10 +187,14 @@ %kf5_makeinstall -C build %fdupes -s %{buildroot} + %find_lang %{name} + %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig +%files lang -f %{name}.lang + %files %defattr(-,root,root) %doc COPYING* README* @@ -207,7 +213,7 @@ %{_kf5_servicetypesdir}/ %{_kf5_datadir}/kdoctools/ %{_kf5_datadir}/widgets/ -%{_kf5_sharedir}/locale/ +%{_kf5_sharedir}/locale/kf5_all_languages %{_kf5_datadir}/locale/ %{_kf5_mandir}/man1/kf5-config.* %doc %{_kf5_htmldir}/ ++++++ kdelibs4support-5.2.0.tar.xz -> kdelibs4support-5.3.0.tar.xz ++++++ ++++ 1153697 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0