December 2017 - openSUSE Commits - openSUSE Mailing Lists

commit fabtests for openSUSE:Factory
by root＠hilbert.suse.de 31 Dec '17

31 Dec '17

Hello community, here is the log from the commit of package fabtests for openSUSE:Factory checked in at 2017-12-31 01:13:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fabtests (Old) and /work/SRC/openSUSE:Factory/.fabtests.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fabtests" Sun Dec 31 01:13:08 2017 rev:7 rq:559255 version:1.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/fabtests/fabtests.changes 2017-11-24 10:53:43.937902981 +0100 +++ /work/SRC/openSUSE:Factory/.fabtests.new/fabtests.changes 2017-12-31 01:13:15.256404104 +0100 @@ -1,0 +2,6 @@ +Wed Dec 20 08:55:18 UTC 2017 - nmoreychaisemartin(a)suse.com + +- Update to version 1.5.3 + * No release notes available + +------------------------------------------------------------------- Old: ---- fabtests-1.5.2.0.ed3448c.tar.bz2 New: ---- fabtests-1.5.3.0.14a683c40239.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fabtests.spec ++++++ --- /var/tmp/diff_new_pack.lZnXZK/_old 2017-12-31 01:13:15.952171972 +0100 +++ /var/tmp/diff_new_pack.lZnXZK/_new 2017-12-31 01:13:15.956170638 +0100 @@ -16,10 +16,10 @@ # -%define git_ver .0.ed3448c +%define git_ver .0.14a683c40239 Name: fabtests -Version: 1.5.2 +Version: 1.5.3 Release: 0 Summary: Test suite for libfabric API License: BSD-2-Clause or GPL-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.lZnXZK/_old 2017-12-31 01:13:15.992158631 +0100 +++ /var/tmp/diff_new_pack.lZnXZK/_new 2017-12-31 01:13:15.992158631 +0100 @@ -8,7 +8,7 @@ <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param> - <param name="revision">ed3448c2a71fd68d6999bdc872ec2aeb061e8d1a</param> + <param name="revision">14a683c40239650a6c3cdd95a979801e1908941b</param> </service> <service name="recompress" mode="disabled"> <param name="file">fabtests*.tar</param> ++++++ fabtests-1.5.2.0.ed3448c.tar.bz2 -> fabtests-1.5.3.0.14a683c40239.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/.appveyor.yml new/fabtests-1.5.3.0.14a683c40239/.appveyor.yml --- old/fabtests-1.5.2.0.ed3448c/.appveyor.yml 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/.appveyor.yml 2017-12-19 14:02:59.000000000 +0100 @@ -11,6 +11,7 @@ - cd .. - git clone https://github.com/ofiwg/libfabric - cd libfabric + - git checkout -b v1.5.x origin/v1.5.x - ps: .appveyor.ps1 -Verbose - msbuild libfabric.sln - set PATH=%CD%\x64\%CONFIGURATION%;%PATH% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/benchmarks/dgram_pingpong.c new/fabtests-1.5.3.0.14a683c40239/benchmarks/dgram_pingpong.c --- old/fabtests-1.5.2.0.ed3448c/benchmarks/dgram_pingpong.c 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/benchmarks/dgram_pingpong.c 2017-12-19 14:02:59.000000000 +0100 @@ -52,7 +52,7 @@ /* Post an extra receive to avoid lacking a posted receive in the * finalize. */ - ret = fi_recv(ep, rx_buf, rx_size + ft_rx_prefix_size(), fi_mr_desc(mr), + ret = fi_recv(ep, rx_buf, rx_size + ft_rx_prefix_size(), mr_desc, 0, &rx_ctx); if (!(opts.options & FT_OPT_SIZE)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/common/shared.c new/fabtests-1.5.3.0.14a683c40239/common/shared.c --- old/fabtests-1.5.2.0.ed3448c/common/shared.c 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/common/shared.c 2017-12-19 14:02:59.000000000 +0100 @@ -59,6 +59,7 @@ struct fid_cq *txcq, *rxcq; struct fid_cntr *txcntr, *rxcntr; struct fid_mr *mr; +void *mr_desc = NULL; struct fid_av *av; struct fid_eq *eq; struct fid_mc *mc; @@ -160,13 +161,13 @@ return ret; } -size_t ft_tx_prefix_size() +size_t ft_tx_prefix_size(void) { return (fi->tx_attr->mode & FI_MSG_PREFIX) ? fi->ep_attr->msg_prefix_size : 0; } -size_t ft_rx_prefix_size() +size_t ft_rx_prefix_size(void) { return (fi->rx_attr->mode & FI_MSG_PREFIX) ? fi->ep_attr->msg_prefix_size : 0; @@ -225,7 +226,7 @@ return fi_cntr_open(domain, &cntr_attr, cntr, cntr); } -int ft_rma_read_target_allowed(uint64_t caps) +static inline int ft_rma_read_target_allowed(uint64_t caps) { if (caps & (FI_RMA | FI_ATOMIC)) { if (caps & FI_REMOTE_READ) @@ -235,7 +236,7 @@ return 0; } -int ft_rma_write_target_allowed(uint64_t caps) +static inline int ft_rma_write_target_allowed(uint64_t caps) { if (caps & (FI_RMA | FI_ATOMIC)) { if (caps & FI_REMOTE_WRITE) @@ -245,10 +246,16 @@ return 0; } +static inline int ft_check_mr_local_flag(struct fi_info *info) +{ + return ((info->mode & FI_LOCAL_MR) || + (info->domain_attr->mr_mode & FI_MR_LOCAL)); +} + uint64_t ft_info_to_mr_access(struct fi_info *info) { uint64_t mr_access = 0; - if ((info->mode & FI_LOCAL_MR) || (info->domain_attr->mr_mode & FI_MR_LOCAL)) { + if (ft_check_mr_local_flag(info)) { if (info->caps & (FI_MSG | FI_TAGGED)) { if (info->caps & FT_MSG_MR_ACCESS) { mr_access |= info->caps & FT_MSG_MR_ACCESS; @@ -395,6 +402,7 @@ FT_PRINTERR("fi_mr_reg", ret); return ret; } + mr_desc = ft_check_mr_local_flag(fi) ? fi_mr_desc(mr) : NULL; } else { if (ft_mr_alloc_func) { ret = ft_mr_alloc_func(); @@ -799,7 +807,8 @@ struct fid_cq *rxcq, struct fid_cntr *txcntr, struct fid_cntr *rxcntr, bool post_initial_recv) { - int flags, ret; + uint64_t flags; + int ret; if (fi->ep_attr->type == FI_EP_MSG || fi->caps & FI_MULTICAST) FT_EP_BIND(ep, eq, 0); @@ -1358,13 +1367,14 @@ ssize_t ft_post_tx(struct fid_ep *ep, fi_addr_t fi_addr, size_t size, struct fi_context* ctx) { + if (hints->caps & FI_TAGGED) { FT_POST(fi_tsend, ft_get_tx_comp, tx_seq, "transmit", ep, - tx_buf, size + ft_tx_prefix_size(), fi_mr_desc(mr), + tx_buf, size + ft_tx_prefix_size(), mr_desc, fi_addr, ft_tag ? ft_tag : tx_seq, ctx); } else { FT_POST(fi_send, ft_get_tx_comp, tx_seq, "transmit", ep, - tx_buf, size + ft_tx_prefix_size(), fi_mr_desc(mr), + tx_buf, size + ft_tx_prefix_size(), mr_desc, fi_addr, ctx); } return 0; @@ -1421,19 +1431,18 @@ switch (op) { case FT_RMA_WRITE: FT_POST(fi_write, ft_get_tx_comp, tx_seq, "fi_write", ep, tx_buf, - opts.transfer_size, fi_mr_desc(mr), remote_fi_addr, - remote->addr, remote->key, context); + opts.transfer_size, mr_desc, remote_fi_addr, remote->addr, + remote->key, context); break; case FT_RMA_WRITEDATA: FT_POST(fi_writedata, ft_get_tx_comp, tx_seq, "fi_writedata", ep, - tx_buf, opts.transfer_size, fi_mr_desc(mr), - remote_cq_data, remote_fi_addr, remote->addr, - remote->key, context); + tx_buf, opts.transfer_size, mr_desc, remote_cq_data, remote_fi_addr, + remote->addr, remote->key, context); break; case FT_RMA_READ: FT_POST(fi_read, ft_get_tx_comp, tx_seq, "fi_read", ep, rx_buf, - opts.transfer_size, fi_mr_desc(mr), remote_fi_addr, - remote->addr, remote->key, context); + opts.transfer_size, mr_desc, remote_fi_addr, remote->addr, + remote->key, context); break; default: FT_ERR("Unknown RMA op type\n"); @@ -1558,11 +1567,11 @@ if (hints->caps & FI_TAGGED) { FT_POST(fi_trecv, ft_get_rx_comp, rx_seq, "receive", ep, rx_buf, MAX(size, FT_MAX_CTRL_MSG) + ft_rx_prefix_size(), - fi_mr_desc(mr), 0, ft_tag ? ft_tag : rx_seq, 0, ctx); + mr_desc, 0, ft_tag ? ft_tag : rx_seq, 0, ctx); } else { FT_POST(fi_recv, ft_get_rx_comp, rx_seq, "receive", ep, rx_buf, MAX(size, FT_MAX_CTRL_MSG) + ft_rx_prefix_size(), - fi_mr_desc(mr), 0, ctx); + mr_desc, 0, ctx); } return 0; } @@ -1787,7 +1796,7 @@ } } -int ft_sync() +int ft_sync(void) { int ret; @@ -1844,7 +1853,7 @@ return 0; } -int ft_fork_and_pair() +int ft_fork_and_pair(void) { int ret; @@ -1865,7 +1874,7 @@ return 0; } -int ft_wait_child() +int ft_wait_child(void) { int ret; @@ -1895,7 +1904,6 @@ struct iovec iov; int ret; struct fi_context ctx; - void *desc = fi_mr_desc(mr); strcpy(tx_buf + ft_tx_prefix_size(), "fin"); iov.iov_base = tx_buf; @@ -1906,7 +1914,7 @@ memset(&tmsg, 0, sizeof tmsg); tmsg.msg_iov = &iov; - tmsg.desc = &desc; + tmsg.desc = &mr_desc; tmsg.iov_count = 1; tmsg.addr = remote_fi_addr; tmsg.tag = tx_seq; @@ -1919,7 +1927,7 @@ memset(&msg, 0, sizeof msg); msg.msg_iov = &iov; - msg.desc = &desc; + msg.desc = &mr_desc; msg.iov_count = 1; msg.addr = remote_fi_addr; msg.context = &ctx; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/complex/ft_domain.c new/fabtests-1.5.3.0.14a683c40239/complex/ft_domain.c --- old/fabtests-1.5.2.0.ed3448c/complex/ft_domain.c 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/complex/ft_domain.c 2017-12-19 14:02:59.000000000 +0100 @@ -191,8 +191,9 @@ memset(ctrl->buf, 0, size); } - if ((fabric_info->mode & FI_LOCAL_MR) && !ctrl->mr) { - ret = fi_mr_reg(domain, ctrl->buf, size, FI_RECV | FI_SEND, + if ((fabric_info->domain_attr->mr_mode & FI_MR_LOCAL) && !ctrl->mr) { + ret = fi_mr_reg(domain, ctrl->buf, size, + ft_info_to_mr_access(fabric_info), 0, 0, 0, &ctrl->mr, NULL); if (ret) { FT_PRINTERR("fi_mr_reg", ret); @@ -238,7 +239,7 @@ memset(ctrl->orig_buf, 0, size); } - if (fabric_info->mode & FI_LOCAL_MR) { + if (fabric_info->domain_attr->mr_mode & FI_MR_LOCAL) { access = FI_READ | FI_WRITE | FI_REMOTE_READ | FI_REMOTE_WRITE; if (!ctrl->res_mr) { ret = fi_mr_reg(domain, ctrl->res_buf, size, access, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/complex/ft_msg.c new/fabtests-1.5.3.0.14a683c40239/complex/ft_msg.c --- old/fabtests-1.5.2.0.ed3448c/complex/ft_msg.c 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/complex/ft_msg.c 2017-12-19 14:02:59.000000000 +0100 @@ -261,7 +261,7 @@ switch (test_info.class_function) { case FT_FUNC_READ: ft_send_retry(ret, fi_read, ft_tx_ctrl.ep, ft_tx_ctrl.buf, - ft_tx_ctrl.rma_msg_size, ft_mr_ctrl.memdesc, + ft_tx_ctrl.rma_msg_size, ft_tx_ctrl.memdesc, ft_tx_ctrl.addr, 0, ft_mr_ctrl.mr_key, ctx); ft_tx_ctrl.credits--; break; @@ -333,7 +333,7 @@ break; case FT_FUNC_WRITEDATA: ft_send_retry(ret, fi_writedata, ft_tx_ctrl.ep, ft_tx_ctrl.buf, - ft_tx_ctrl.rma_msg_size, ft_mr_ctrl.memdesc, ft_tx_ctrl.remote_cq_data, + ft_tx_ctrl.rma_msg_size, ft_tx_ctrl.memdesc, ft_tx_ctrl.remote_cq_data, ft_tx_ctrl.addr, 0, ft_mr_ctrl.mr_key, ctx); ft_tx_ctrl.credits--; break; @@ -344,7 +344,7 @@ break; default: ft_send_retry(ret, fi_write, ft_tx_ctrl.ep, ft_tx_ctrl.buf, - ft_tx_ctrl.rma_msg_size, ft_mr_ctrl.memdesc, + ft_tx_ctrl.rma_msg_size, ft_tx_ctrl.memdesc, ft_tx_ctrl.addr, 0, ft_mr_ctrl.mr_key, ctx); ft_tx_ctrl.credits--; break; @@ -599,7 +599,7 @@ return ret; ft_send_retry(ret, fi_writedata, ft_tx_ctrl.ep, ft_tx_ctrl.buf, - 0, ft_mr_ctrl.memdesc, ft_tx_ctrl.remote_cq_data, + 0, ft_tx_ctrl.memdesc, ft_tx_ctrl.remote_cq_data, ft_tx_ctrl.addr, 0, ft_mr_ctrl.mr_key, ctx); ft_tx_ctrl.credits--; return ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/configure.ac new/fabtests-1.5.3.0.14a683c40239/configure.ac --- old/fabtests-1.5.2.0.ed3448c/configure.ac 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/configure.ac 2017-12-19 14:02:59.000000000 +0100 @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([fabtests], [1.5.2], [ofiwg(a)lists.openfabrics.org]) +AC_INIT([fabtests], [1.5.3], [ofiwg(a)lists.openfabrics.org]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR(config) AC_CONFIG_HEADERS(config.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/include/shared.h new/fabtests-1.5.3.0.14a683c40239/include/shared.h --- old/fabtests-1.5.2.0.ed3448c/include/shared.h 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/include/shared.h 2017-12-19 14:02:59.000000000 +0100 @@ -157,6 +157,7 @@ extern struct fid_cq *txcq, *rxcq; extern struct fid_cntr *txcntr, *rxcntr; extern struct fid_mr *mr, no_mr; +extern void *mr_desc; extern struct fid_av *av; extern struct fid_eq *eq; extern struct fid_mc *mc; @@ -373,14 +374,14 @@ return true; } -int ft_sync(); +int ft_sync(void); int ft_sync_pair(int status); -int ft_fork_and_pair(); -int ft_wait_child(); +int ft_fork_and_pair(void); +int ft_wait_child(void); int ft_finalize(void); -size_t ft_rx_prefix_size(); -size_t ft_tx_prefix_size(); +size_t ft_rx_prefix_size(void); +size_t ft_tx_prefix_size(void); ssize_t ft_post_rx(struct fid_ep *ep, size_t size, struct fi_context* ctx); ssize_t ft_post_tx(struct fid_ep *ep, fi_addr_t fi_addr, size_t size, struct fi_context* ctx); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/dgram_waitset.c new/fabtests-1.5.3.0.14a683c40239/simple/dgram_waitset.c --- old/fabtests-1.5.2.0.ed3448c/simple/dgram_waitset.c 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/simple/dgram_waitset.c 2017-12-19 14:02:59.000000000 +0100 @@ -84,8 +84,8 @@ struct fi_cq_entry comp; int ret; - ret = fi_recv(ep, rx_buf, rx_size + ft_rx_prefix_size(), fi_mr_desc(mr), - 0, &rx_ctx); + ret = fi_recv(ep, rx_buf, rx_size + ft_rx_prefix_size(), + mr_desc, 0, &rx_ctx); if (ret) return ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/poll.c new/fabtests-1.5.3.0.14a683c40239/simple/poll.c --- old/fabtests-1.5.2.0.ed3448c/simple/poll.c 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/simple/poll.c 2017-12-19 14:02:59.000000000 +0100 @@ -122,8 +122,10 @@ if (ret) return ret; - while ((txcq && (tx_cq_cntr < tx_seq)) || (rxcq && (rx_cq_cntr < rx_seq)) || - (txcntr && !tx_cntr_done) || (rxcntr && !rx_cntr_done)) { + while (((opts.options & FT_OPT_TX_CQ) && (tx_cq_cntr < tx_seq)) || + ((opts.options & FT_OPT_TX_CNTR) && (!tx_cntr_done)) || + ((opts.options & FT_OPT_RX_CQ) && (rx_cq_cntr < rx_seq)) || + ((opts.options & FT_OPT_RX_CNTR) && (!rx_cntr_done))) { /* Poll send and recv CQs/Cntrs */ do { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/rdm_deferred_wq.c new/fabtests-1.5.3.0.14a683c40239/simple/rdm_deferred_wq.c --- old/fabtests-1.5.2.0.ed3448c/simple/rdm_deferred_wq.c 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/simple/rdm_deferred_wq.c 2017-12-19 14:02:59.000000000 +0100 @@ -54,7 +54,7 @@ size_t size, void *ctx) { msg->context = ctx; - msg->desc = fi_mr_desc(mr); + msg->desc = mr_desc; msg->iov_count = 1; msg->addr = remote_fi_addr; msg->data = 0; @@ -69,7 +69,7 @@ uint64_t tag) { msg->context = ctx; - msg->desc = fi_mr_desc(mr); + msg->desc = mr_desc; msg->iov_count = 1; msg->addr = remote_fi_addr; msg->data = 0; @@ -85,7 +85,7 @@ size_t size, void *ctx) { msg->context = ctx; - msg->desc = fi_mr_desc(mr); + msg->desc = mr_desc; msg->iov_count = 1; msg->addr = remote_fi_addr; msg->rma_iov_count = 1; @@ -106,7 +106,7 @@ enum fi_op op) { msg->context = ctx; - msg->desc = fi_mr_desc(mr); + msg->desc = mr_desc; msg->iov_count = 1; msg->rma_iov_count = 1; msg->addr = remote_fi_addr; @@ -197,7 +197,7 @@ int ret; if (opts.dst_addr) { - ret = fi_write(ep, tx_buf, strlen(welcome_text), fi_mr_desc(mr), + ret = fi_write(ep, tx_buf, strlen(welcome_text), mr_desc, remote_fi_addr, 0, FT_MR_KEY, &tx_ctx); if (ret) { FT_PRINTERR("fi_write", ret); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/rdm_rma_simple.c new/fabtests-1.5.3.0.14a683c40239/simple/rdm_rma_simple.c --- old/fabtests-1.5.2.0.ed3448c/simple/rdm_rma_simple.c 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/simple/rdm_rma_simple.c 2017-12-19 14:02:59.000000000 +0100 @@ -57,8 +57,9 @@ fprintf(stderr, "Transmit buffer too small.\n"); return -FI_ETOOSMALL; } - ret = fi_write(ep, tx_buf, message_len, fi_mr_desc(mr), - remote_fi_addr, 0, FT_MR_KEY, &fi_ctx_write); + ret = fi_write(ep, tx_buf, message_len, mr_desc, + remote_fi_addr, 0, FT_MR_KEY, + &fi_ctx_write); if (ret) return ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/rdm_rma_trigger.c new/fabtests-1.5.3.0.14a683c40239/simple/rdm_rma_trigger.c --- old/fabtests-1.5.2.0.ed3448c/simple/rdm_rma_trigger.c 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/simple/rdm_rma_trigger.c 2017-12-19 14:02:59.000000000 +0100 @@ -49,8 +49,9 @@ triggered_ctx.event_type = FI_TRIGGER_THRESHOLD; triggered_ctx.trigger.threshold.cntr = cntr; triggered_ctx.trigger.threshold.threshold = threshold; - ret = fi_write(alias_ep, src, size, fi_mr_desc(mr), remote_fi_addr, 0, - FT_MR_KEY, &triggered_ctx); + ret = fi_write(alias_ep, src, size, mr_desc, + remote_fi_addr, 0, + FT_MR_KEY, &triggered_ctx); if (ret){ FT_PRINTERR("fi_write", ret); return ret; @@ -80,7 +81,7 @@ goto out; fprintf(stdout, "RMA write to server\n"); - ret = fi_write(ep, tx_buf, strlen(welcome_text1), fi_mr_desc(mr), + ret = fi_write(ep, tx_buf, strlen(welcome_text1), mr_desc, remote_fi_addr, 0, FT_MR_KEY, &tx_ctx); if (ret){ FT_PRINTERR("fi_write", ret); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/rdm_tagged_peek.c new/fabtests-1.5.3.0.14a683c40239/simple/rdm_tagged_peek.c --- old/fabtests-1.5.2.0.ed3448c/simple/rdm_tagged_peek.c 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/simple/rdm_tagged_peek.c 2017-12-19 14:02:59.000000000 +0100 @@ -70,7 +70,7 @@ iov.iov_base = buf; iov.iov_len = rx_size; msg.msg_iov = &iov; - desc = fi_mr_desc(mr); + desc = mr_desc; msg.desc = &desc; msg.iov_count = 1; msg.addr = remote_fi_addr; @@ -191,8 +191,9 @@ /* sync with sender before ft_finalize, since we sent * and received messages outside of the sequence numbers * maintained by common code */ - ret = fi_tsend(ep, tx_buf, 1, fi_mr_desc(mr), - remote_fi_addr, 0xabc, &tx_ctx_arr[0]); + ret = fi_tsend(ep, tx_buf, 1, mr_desc, + remote_fi_addr, 0xabc, + &tx_ctx_arr[0]); if (ret) return ret; ret = wait_for_send_comp(1); @@ -201,8 +202,9 @@ } else { printf("Sending five tagged messages\n"); for(i = 0; i < 5; i++) { - ret = fi_tsend(ep, tx_buf, tx_size, fi_mr_desc(mr), - remote_fi_addr, 0x900d+i, &tx_ctx_arr[i]); + ret = fi_tsend(ep, tx_buf, tx_size, mr_desc, + remote_fi_addr, 0x900d+i, + &tx_ctx_arr[i]); if (ret) return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/scalable_ep.c new/fabtests-1.5.3.0.14a683c40239/simple/scalable_ep.c --- old/fabtests-1.5.2.0.ed3448c/simple/scalable_ep.c 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/simple/scalable_ep.c 2017-12-19 14:02:59.000000000 +0100 @@ -162,7 +162,7 @@ } ret = fi_recv(rx_ep[i], rx_buf, MAX(rx_size, FT_MAX_CTRL_MSG), - fi_mr_desc(mr), 0, NULL); + mr_desc, 0, NULL); if (ret) { FT_PRINTERR("fi_recv", ret); return ret; @@ -208,8 +208,8 @@ for (i = 0; i < ctx_cnt && !ret; i++) { fprintf(stdout, "Posting send for ctx: %d\n", i); tb[0] = DATA + i; - ret = fi_send(tx_ep[i], tx_buf, tx_size, fi_mr_desc(mr), - remote_rx_addr[i], NULL); + ret = fi_send(tx_ep[i], tx_buf, tx_size, mr_desc, + remote_rx_addr[i], NULL); if (ret) { FT_PRINTERR("fi_send", ret); return ret; @@ -288,7 +288,7 @@ } ret = fi_send(tx_ep[0], tx_buf, addrlen, - fi_mr_desc(mr), remote_fi_addr, NULL); + mr_desc, remote_fi_addr, NULL); if (ret) { FT_PRINTERR("fi_send", ret); return ret; @@ -307,7 +307,7 @@ return ret; ret = fi_send(tx_ep[0], tx_buf, 1, - fi_mr_desc(mr), remote_fi_addr, NULL); + mr_desc, remote_fi_addr, NULL); if (ret) { FT_PRINTERR("fi_send", ret); return ret; @@ -317,7 +317,7 @@ for (i = 0; i < ctx_cnt; i++) remote_rx_addr[i] = fi_rx_addr(remote_fi_addr, i, rx_ctx_bits); - ret = fi_recv(rx_ep[0], rx_buf, rx_size, fi_mr_desc(mr), 0, NULL); + ret = fi_recv(rx_ep[0], rx_buf, rx_size, mr_desc, 0, NULL); if (ret) { FT_PRINTERR("fi_recv", ret); return ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/streaming/rdm_atomic.c new/fabtests-1.5.3.0.14a683c40239/streaming/rdm_atomic.c --- old/fabtests-1.5.2.0.ed3448c/streaming/rdm_atomic.c 2017-11-08 22:48:45.000000000 +0100 +++ new/fabtests-1.5.3.0.14a683c40239/streaming/rdm_atomic.c 2017-12-19 14:02:59.000000000 +0100 @@ -98,7 +98,7 @@ { int ret; - ret = fi_atomic(ep, buf, 1, fi_mr_desc(mr), remote_fi_addr, remote.addr, + ret = fi_atomic(ep, buf, 1, mr_desc, remote_fi_addr, remote.addr, remote.key, datatype, op, &fi_ctx_atomic); if (ret) { FT_PRINTERR("fi_atomic", ret); @@ -113,7 +113,7 @@ { int ret; - ret = fi_fetch_atomic(ep, buf, 1, fi_mr_desc(mr), result, + ret = fi_fetch_atomic(ep, buf, 1, mr_desc, result, fi_mr_desc(mr_result), remote_fi_addr, remote.addr, remote.key, datatype, op, &fi_ctx_atomic); if (ret) { @@ -129,7 +129,7 @@ { int ret; - ret = fi_compare_atomic(ep, buf, 1, fi_mr_desc(mr), compare, + ret = fi_compare_atomic(ep, buf, 1, mr_desc, compare, fi_mr_desc(mr_compare), result, fi_mr_desc(mr_result), remote_fi_addr, remote.addr, remote.key, datatype, op, &fi_ctx_atomic);

1 0

commit libmediainfo for openSUSE:Factory
by root＠hilbert.suse.de 31 Dec '17

31 Dec '17

Hello community, here is the log from the commit of package libmediainfo for openSUSE:Factory checked in at 2017-12-31 01:13:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmediainfo (Old) and /work/SRC/openSUSE:Factory/.libmediainfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmediainfo" Sun Dec 31 01:13:05 2017 rev:9 rq:559137 version:17.12 Changes: -------- --- /work/SRC/openSUSE:Factory/libmediainfo/libmediainfo.changes 2017-11-03 16:30:23.480110049 +0100 +++ /work/SRC/openSUSE:Factory/.libmediainfo.new/libmediainfo.changes 2017-12-31 01:13:06.631281751 +0100 @@ -1,0 +2,35 @@ +Thu Dec 21 14:35:28 UTC 2017 - aloisio(a)gmx.com + +- Update to version 17.12 + * MediaInfoOnline: https://mediaarea.net/MediaInfoOnline + * JavaScript build and example + * Dolby Vision: detection of Dolby Vision and display of profile + for MPEG-TS and MP4 files + * MPEG-4: Support of external time code tracks (.qtc) + * JPEG 2000: Support of IMF profiles + * F523, BDMV: Support of UHD Blu-ray playlist + * Endianness and Sign report for PCM Matroska tracks + * MPEG-4: Resolume DXV display + * MPEG-4: support of file names >64 chars long or non ASCII for + referenced files + * Slight binary size optimizations + * colour_description: some changes in order to have more + readable names (DCI P3, Display P3, sRGB) + * MP4: crash with some HEVC streams with Dolby Vision + * VC-3: frame rate should not be detected as wrong when there + are several frames per block + * Matroska: wrong color range info + * Matroska: fix crash with some corrupted files + * MXF: better support of height when there is an incoherence + between header and footer + * transfer_characteristics: fix BT.2020 difference between + values 14 and 15 + * Trace: fix freeze with some files + * Trace: invalid character encoding with some MOV files + * Some memory leak fixes + +- New source URL + +- Spec cleanup + +------------------------------------------------------------------- Old: ---- libmediainfo_17.10.tar.xz New: ---- libmediainfo_17.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmediainfo.spec ++++++ --- /var/tmp/diff_new_pack.hFfTBk/_old 2017-12-31 01:13:10.318051713 +0100 +++ /var/tmp/diff_new_pack.hFfTBk/_new 2017-12-31 01:13:10.318051713 +0100 @@ -19,25 +19,24 @@ %define sover 0 Name: libmediainfo -Version: 17.10 +Version: 17.12 Release: 0 Summary: Supplies technical and tag information about a video or audio file License: BSD-2-Clause Group: Development/Libraries/C and C++ -Url: http://mediainfo.sourceforge.net/ -Source: https://sourceforge.net/projects/mediainfo/files/source/libmediainfo/%{vers… +Url: https://mediaarea.net +Source: https://mediaarea.net/download/source/%{name}/%{version}/%{name}_%{version}… Source1: baselibs.conf BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: libcurl-devel -BuildRequires: libmms-devel BuildRequires: libtool -BuildRequires: libzen-devel >= 0.4.31 BuildRequires: pkgconfig -BuildRequires: zlib-devel BuildRequires: pkgconfig(glib-2.0) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libmms) +BuildRequires: pkgconfig(libzen) >= 0.4.37 +BuildRequires: pkgconfig(zlib) %description MediaInfo supplies technical and tag information about a video or @@ -76,10 +75,10 @@ Summary: Include files and libraries for development Group: Development/Libraries/C and C++ Requires: %{name}%{sover} = %{version} -Requires: glibc-devel -Requires: libcurl-devel -Requires: libmms-devel -Requires: zlib-devel +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libmms) +BuildRequires: pkgconfig(zlib) %description -n libmediainfo-devel Include files and mandatory libraries for development. @@ -106,14 +105,12 @@ export CXXFLAGS="%{optflags} -I%{_includedir}/libmms" pushd Project/GNU/Library - chmod +x autogen.sh - ./autogen.sh + autoreconf -fiv %configure \ --enable-shared \ --disable-static \ --with-libcurl \ --with-libmms=%{_libdir} - make %{?_smp_mflags} popd @@ -140,12 +137,8 @@ install -m 644 Source/MediaInfoDLL/MediaInfoDLL3.py \ %{buildroot}%{_includedir}/MediaInfoDLL -sed -i -e 's|Version: |Version: %{version}|g' \ - Project/GNU/Library/libmediainfo.pc -install -dm 755 %{buildroot}%{_libdir}/pkgconfig -install -m 644 Project/GNU/Library/libmediainfo.pc \ - %{buildroot}%{_libdir}/pkgconfig - +sed -i -e '/^Libs_Static/d' \ + %{buildroot}%{_libdir}/pkgconfig/%{name}.pc rm Doc/installdox || true rm %{buildroot}%{_libdir}/libmediainfo.la %fdupes -s %{buildroot}/%{_datadir} ++++++ libmediainfo_17.10.tar.xz -> libmediainfo_17.12.tar.xz ++++++ ++++ 9825 lines of diff (skipped)

1 0

commit xfce4-panel-plugin-cpufreq for openSUSE:Factory
by root＠hilbert.suse.de 31 Dec '17

31 Dec '17

Hello community, here is the log from the commit of package xfce4-panel-plugin-cpufreq for openSUSE:Factory checked in at 2017-12-31 01:12:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-cpufreq (Old) and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-cpufreq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-panel-plugin-cpufreq" Sun Dec 31 01:12:50 2017 rev:15 rq:555727 version:1.1.90 Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-panel-plugin-cpufreq/xfce4-panel-plugin-cpufreq.changes 2017-10-07 17:49:55.413261094 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-cpufreq.new/xfce4-panel-plugin-cpufreq.changes 2017-12-31 01:12:57.254410209 +0100 @@ -1,0 +2,8 @@ +Tue Nov 28 07:57:15 UTC 2017 - seife+obs(a)b1-systems.com + +- update to version 1.1.90 + - port to GTK-3 + - translation updates +- do not package ChangeLog, NEWS is enough + +------------------------------------------------------------------- Old: ---- xfce4-cpufreq-plugin-1.1.3.tar.bz2 New: ---- xfce4-cpufreq-plugin-1.1.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel-plugin-cpufreq.spec ++++++ --- /var/tmp/diff_new_pack.9KoR2i/_old 2017-12-31 01:12:58.222087358 +0100 +++ /var/tmp/diff_new_pack.9KoR2i/_new 2017-12-31 01:12:58.226086023 +0100 @@ -16,10 +16,10 @@ # -%define panel_version 4.10.0 +%define panel_version 4.12.0 %define plugin_name xfce4-cpufreq-plugin Name: xfce4-panel-plugin-cpufreq -Version: 1.1.3 +Version: 1.1.90 Release: 0 Summary: CPU Frequency Scaling Monitor Plugin for the Xfce Panel License: GPL-2.0+ @@ -29,10 +29,9 @@ BuildRequires: fdupes BuildRequires: intltool BuildRequires: pkgconfig(gthread-2.0) -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(libxfce4panel-1.0) -BuildRequires: pkgconfig(libxfce4ui-1) -BuildRequires: pkgconfig(libxfce4util-1.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20.0 +BuildRequires: pkgconfig(libxfce4panel-2.0) >= %panel_version +BuildRequires: pkgconfig(libxfce4ui-2) >= %panel_version Requires: xfce4-panel >= %{panel_version} Recommends: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -67,7 +66,7 @@ %files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS COPYING NEWS README %{_libdir}/xfce4/panel/plugins/libcpufreq.so* %{_datadir}/icons/hicolor/*/apps/xfce4-cpufreq-plugin.* %{_datadir}/xfce4/panel/plugins/cpufreq.desktop ++++++ xfce4-cpufreq-plugin-1.1.3.tar.bz2 -> xfce4-cpufreq-plugin-1.1.90.tar.bz2 ++++++ ++++ 7298 lines of diff (skipped)

1 0

commit pacemaker for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '17

30 Dec '17

Hello community, here is the log from the commit of package pacemaker for openSUSE:Factory checked in at 2017-12-31 00:44:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pacemaker (Old) and /work/SRC/openSUSE:Factory/.pacemaker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pacemaker" Sun Dec 31 00:44:08 2017 rev:114 rq:559650 version:1.1.18+20171221.c91a650ec Changes: -------- --- /work/SRC/openSUSE:Factory/pacemaker/pacemaker.changes 2017-12-03 10:11:35.466981420 +0100 +++ /work/SRC/openSUSE:Factory/.pacemaker.new/pacemaker.changes 2017-12-31 00:44:18.327759335 +0100 @@ -1,0 +2,43 @@ +Sat Dec 23 12:03:19 UTC 2017 - ygao(a)suse.com + +- Update to version 1.1.18+20171221.c91a650ec: +- libcrmcommon: drop special handling of pre-1.1.7 failed recurring op history +- libcrmcommon: drop special handling of pre-1.1.4 migration history entries +- crmd: drop support for DCs that don't support throttling +- cib,libcrmcommon: drop support for PCMK_legacy variable + +------------------------------------------------------------------- +Fri Dec 22 05:15:12 UTC 2017 - ygao(a)suse.com + +- libcrmcluster: use crm_strdup_printf() instead of calloc() +- attrd: avoid small memory leak at start-up +- systemd unit files: restore DBus dependency +- libcrmservice: avoid memory leak on DBus error +- pengine: validate more function arguments +- Upstream version cs: 098d557cc495944e1b6ebd9d05b819d6da74825e + +------------------------------------------------------------------- +Mon Dec 18 13:22:27 UTC 2017 - ygao(a)suse.com + +- libpe_status: drop support for "requires" operation meta-attribute (fate#324508) +- tools: crm_resource --cleanup with no resource specified (bsc#1071503) +- tools: crm_resource --cleanup (bsc#1071503) +- crmd,libpe_status: drop support for legacy option aliases (fate#324508) +- libstonithd,libpe_status: drop support for pcmk_poweroff_action (fate#324508) +- libstonithd,libpe_status: drop support for pcmk_arg_map (fate#324508) +- libstonithd,libpe_status: drop support for pcmk_*_cmd (fate#324508) +- libpe_status,libpe_rules: drop support for default-action-timeout (fate#324508) +- libpe_status: use correct default timeout for probes +- libpe_status: drop support for operation meta-attributes in instance_attributes (fate#324508) +- libpe_status: fix precedence of operation meta-attributes +- libpe_status,libpe_rules: remove support for is-managed-default (fate#324508) +- libpe_status,libpe_rules: drop support for default-resource-stickiness (fate#324508) +- crmd: drop support for LRMD_MAX_CHILDREN environment variable (fate#324508) +- tools: remove crm_mon SMTP support (fate#324508) +- tools: remove crm_mon SNMP support (fate#324508) +- lrmd: remove deprecated -r/--dummy command-line option (fate#324508) +- tools: crm_resource --cleanup for non-primitive resources (bsc#1071503) +- pengine: unfence before probing or starting fence devices +- Upstream version cs: 4528eb3b726197ab077243ab923ed291473f0ed7 + +------------------------------------------------------------------- @@ -10,5 +53,5 @@ -- libpe_status: remove support for default-resource-failure-stickiness -- libpe_status: remove support for resource-failure-stickiness -- various: remove support for pre-Pacemaker-1.0 CIB XML -- libpe_status,tools: remove support for legacy ticket state entries -- various: remove isolation wrapper support +- libpe_status: remove support for default-resource-failure-stickiness (fate#324508) +- libpe_status: remove support for resource-failure-stickiness (fate#324508) +- various: remove support for pre-Pacemaker-1.0 CIB XML (fate#324508) +- libpe_status,tools: remove support for legacy ticket state entries (fate#324508) +- various: remove isolation wrapper support (fate#324508) @@ -30,2 +73,2 @@ -- crmd: default record-pending to TRUE -- tools: enable new crm_resource --cleanup/--refresh behavior +- crmd: default record-pending to TRUE (fate#324508) +- tools: enable new crm_resource --cleanup/--refresh behavior (fate#324508) @@ -300 +343 @@ -- stonith-ng: add pcmk_delay_base as static base-delay +- stonith-ng: add pcmk_delay_base as static base-delay (fate#324488) Old: ---- pacemaker-1.1.18+20171129.407ded8de.tar.bz2 New: ---- pacemaker-1.1.18+20171221.c91a650ec.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pacemaker.spec ++++++ --- /var/tmp/diff_new_pack.cz8RQK/_old 2017-12-31 00:44:19.071511261 +0100 +++ /var/tmp/diff_new_pack.cz8RQK/_new 2017-12-31 00:44:19.071511261 +0100 @@ -30,14 +30,10 @@ ## Where to install Pacemaker documentation %global pcmk_docdir %{_docdir}/%{name} -%global commit 1.1.18+20171129.407ded8de - ## Corosync version %define cs_version 2 %define with_nagios 1 -%define with_snmp 0 -%define with_esmtp 0 %define with_cibsecrets 1 %define enable_lib_cluster_pkg 0 %define enable_fatal_warnings 0 @@ -71,7 +67,7 @@ %endif Name: pacemaker -Version: 1.1.18 +Version: 1.1.18+20171221.c91a650ec Release: 0 Summary: Scalable High-Availability cluster resource manager # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary @@ -80,7 +76,7 @@ Url: http://www.clusterlabs.org # Hint: use "spectool -s 0 pacemaker.spec" (rpmdevtools) to check the final URL: # https://github.com/ClusterLabs/pacemaker/archive/e91769e5a39f5cb2f7b097d3c6… -Source0: %{name}-%{commit}.tar.bz2 +Source0: %{name}-%{version}.tar.xz Source1: crm_report.in Source100: pacemaker.rpmlintrc Patch1: bug-806256_pacemaker-log-level-notice.patch @@ -162,12 +158,6 @@ BuildRequires: inkscape BuildRequires: publican %endif -%if %{with_snmp} -BuildRequires: net-snmp-devel -%endif -%if %{with_esmtp} -BuildRequires: libesmtp-devel -%endif %if %{with_regression_tests} BuildRequires: procps BuildRequires: python-curses @@ -176,7 +166,7 @@ %description Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. It supports more than 16 node clusters with significant capabilities for managing resources and dependencies. @@ -194,7 +184,7 @@ %description cli Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. The %{name}-cli package contains command line tools that can be used to query and control the cluster from machines that may, or may not, @@ -206,7 +196,7 @@ %description -n libpacemaker3 Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. The libpacemaker3 package contains shared libraries needed for cluster nodes and those just running the CLI tools. @@ -219,7 +209,7 @@ %description -n libpacemaker3-cluster Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. The libpacemaker3-cluster package contains cluster-aware shared libraries needed for nodes that will form part of the cluster nodes. @@ -235,7 +225,7 @@ %description remote Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. The %{name}-remote package contains the Pacemaker Remote daemon which is capable of extending pacemaker functionality to remote @@ -267,7 +257,7 @@ %description -n libpacemaker-devel Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. The libpacemaker-devel package contains headers and shared libraries for developing tools for Pacemaker. @@ -293,11 +283,11 @@ Documentation for Pacemaker. Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. %endif %prep -%setup -q -n %{name}-%{commit} +%setup -q -n %{name}-%{version} %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -332,18 +322,10 @@ --docdir=%{_docdir}/%{name} \ --disable-static \ --disable-silent-rules \ - --without-cman \ - --without-heartbeat \ --with-acl=true \ %if %{with_nagios} --with-nagios=true \ %endif -%if %{with_snmp} - --with-snmp=true \ -%endif -%if %{with_esmtp} - --with-esmtp=true \ -%endif %if %{with_cibsecrets} --with-cibsecrets=true \ %endif @@ -382,9 +364,6 @@ rm -f %{buildroot}/%{_initddir}/pacemaker rm -f %{buildroot}/%{_initddir}/pacemaker_remote -# Don't ship fence_pcmk where it has no use -rm -f %{buildroot}/%{_sbindir}/fence_pcmk - %if %{with coverage} GCOV_BASE=%{buildroot}/%{_var}/lib/pacemaker/gcov mkdir -p $GCOV_BASE @@ -576,7 +555,6 @@ %exclude %{_mandir}/man7/ocf_pacemaker_remote.* %{_mandir}/man8/* %exclude %{_mandir}/man8/crm_node.* -%exclude %{_mandir}/man8/fence_pcmk.* %exclude %{_mandir}/man8/fence_legacy.* %exclude %{_mandir}/man8/pacemakerd.* %exclude %{_mandir}/man8/pacemaker_remoted.* ++++++ _service ++++++ --- /var/tmp/diff_new_pack.cz8RQK/_old 2017-12-31 00:44:19.107499258 +0100 +++ /var/tmp/diff_new_pack.cz8RQK/_new 2017-12-31 00:44:19.111497924 +0100 @@ -10,13 +10,14 @@ <param name="version">1.1.18</param> --> - <param name="versionformat">1.1.18+git%cd.%h</param> - <param name="revision">407ded8de381543e71c5b94b3ade296fcfd2c828</param> + <param name="versionformat">1.1.18+%cd.%h</param> + <param name="revision">2.0</param> + <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> - <param name="file">*pacemaker*.tar</param> - <param name="compression">bz2</param> + <param name="file">pacemaker*.tar</param> + <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/>

1 0

commit llvm5 for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '17

30 Dec '17

Hello community, here is the log from the commit of package llvm5 for openSUSE:Factory checked in at 2017-12-31 00:43:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/llvm5 (Old) and /work/SRC/openSUSE:Factory/.llvm5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "llvm5" Sun Dec 31 00:43:47 2017 rev:2 rq:559569 version:5.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/llvm5/llvm5.changes 2017-12-16 20:54:31.854188129 +0100 +++ /work/SRC/openSUSE:Factory/.llvm5.new/llvm5.changes 2017-12-31 00:43:58.202472010 +0100 @@ -1,0 +2,6 @@ +Fri Dec 22 08:56:05 UTC 2017 - fcrozat(a)suse.com + +- Increase minimum memory and disk sizes required for building in + _constraints. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ llvm5.spec ++++++ --- /var/tmp/diff_new_pack.NTCZUq/_old 2017-12-31 00:44:00.585677106 +0100 +++ /var/tmp/diff_new_pack.NTCZUq/_new 2017-12-31 00:44:00.593674438 +0100 @@ -183,8 +183,8 @@ %package -n clang%{_sonum} Summary: CLANG frontend for LLVM -Group: Development/Languages/Other # Avoid multiple provider errors +Group: Development/Languages/Other Requires: libLTO%{_sonum} Requires: libclang%{_sonum} Recommends: clang%{_sonum}-checker @@ -204,8 +204,8 @@ %package -n clang%{_sonum}-checker Summary: Static code analyzer for CLANG -Group: Development/Languages/Other # Avoid multiple provider errors +Group: Development/Languages/Other Requires: libclang%{_sonum} # Due to a packaging error in clang3_8 we have to conflict. Conflicts: clang3_8 @@ -220,8 +220,8 @@ %package -n clang%{_sonum}-include-fixer Summary: Automatically add missing includes -Group: Development/Languages/Other # Avoid multiple provider errors +Group: Development/Languages/Other Requires: libclang%{_sonum} = %{version} Conflicts: clang-include-fixer Conflicts: find-all-symbols @@ -242,8 +242,8 @@ %package -n libclang%{_sonum} Summary: Library files needed for clang -Group: Development/Libraries/C and C++ # Avoid multiple provider errors +Group: Development/Libraries/C and C++ Requires: libLLVM%{_sonum} Requires: libstdc++-devel @@ -274,8 +274,8 @@ %package -n libLTO%{_sonum} Summary: Link-time optimizer for LLVM -Group: Development/Languages/Other # Avoid multiple provider errors +Group: Development/Languages/Other Requires: libLLVM%{_sonum} %description -n libLTO%{_sonum} @@ -283,8 +283,8 @@ %package LTO-devel Summary: Link-time optimizer for LLVM (devel package) -Group: Development/Languages/Other # Avoid multiple provider errors +Group: Development/Languages/Other Requires: %{name}-devel = %{version} Requires: libLTO%{_sonum} Conflicts: libLTO.so @@ -296,8 +296,8 @@ %package gold Summary: Gold linker plugin for LLVM -Group: Development/Languages/Other # Avoid multiple provider errors +Group: Development/Languages/Other Requires: %{name}-devel = %{version} Requires: libLLVM%{_sonum} Conflicts: LLVMgold.so()(64bit) @@ -308,8 +308,8 @@ %package -n libomp%{_sonum}-devel Summary: MPI plugin for LLVM -Group: Development/Languages/Other # Avoid multiple provider errors +Group: Development/Languages/Other Requires: libLLVM%{_sonum} Conflicts: libomp-devel Provides: libomp-devel @@ -329,8 +329,8 @@ %package -n libc++-devel Summary: C++ standard library implementation (devel package) -Group: Development/Languages/C and C++ # Avoid multiple provider errors +Group: Development/Languages/C and C++ Requires: libc++%{_socxx} = %{version} Requires: libc++abi-devel = %{version} Conflicts: libc++.so ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.NTCZUq/_old 2017-12-31 00:44:00.629662434 +0100 +++ /var/tmp/diff_new_pack.NTCZUq/_new 2017-12-31 00:44:00.629662434 +0100 @@ -2,10 +2,10 @@ <constraints> <hardware> <disk> - <size unit="G">45</size> + <size unit="G">49</size> </disk> <memory> - <size unit="M">6500</size> + <size unit="M">9000</size> </memory> </hardware> <overwrite>

1 0

commit jsoncpp for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '17

30 Dec '17

Hello community, here is the log from the commit of package jsoncpp for openSUSE:Factory checked in at 2017-12-31 00:43:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jsoncpp (Old) and /work/SRC/openSUSE:Factory/.jsoncpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jsoncpp" Sun Dec 31 00:43:31 2017 rev:21 rq:559568 version:1.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/jsoncpp/jsoncpp.changes 2017-10-07 17:46:38.377922511 +0200 +++ /work/SRC/openSUSE:Factory/.jsoncpp.new/jsoncpp.changes 2017-12-31 00:43:41.024201728 +0100 @@ -1,0 +2,18 @@ +Sat Dec 23 00:09:57 UTC 2017 - avindra(a)opensuse.org + +- Update to version 1.8.4: + * Functional changes + - Serialize UTF-8 string with Unicode escapes + + Breaks code that relies on not Unicode-escaping encoding + strings. A future release may allow skipping all Unicode + escape. + - Un-deprecate removeMember overloads, return void + - Allow Json::Value to be used in a boolean context + - Use move ctor in append() + - Add value_type to improve integration with boost + * Meta-changes + - Fix meson.build to allow using jsoncpp as a subproject + - Fix some compiler warnings + - Update docs + +------------------------------------------------------------------- Old: ---- jsoncpp-1.8.3.tar.gz New: ---- jsoncpp-1.8.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jsoncpp.spec ++++++ --- /var/tmp/diff_new_pack.dTWZ0Z/_old 2017-12-31 00:43:42.207806943 +0100 +++ /var/tmp/diff_new_pack.dTWZ0Z/_new 2017-12-31 00:43:42.211805609 +0100 @@ -18,7 +18,7 @@ %define sover 19 Name: jsoncpp -Version: 1.8.3 +Version: 1.8.4 Release: 0 Summary: C++ library that allows manipulating with JSON License: MIT ++++++ jsoncpp-1.8.3.tar.gz -> jsoncpp-1.8.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/.travis.yml new/jsoncpp-1.8.4/.travis.yml --- old/jsoncpp-1.8.3/.travis.yml 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/.travis.yml 2017-12-20 22:07:10.000000000 +0100 @@ -6,6 +6,7 @@ # http://stackoverflow.com/questions/22111549/travis-ci-with-clang-3-4-and-c1… # to allow C++11, though we are not yet building with -std=c++11 +before_install: pyenv install 3.5.4 && pyenv global 3.5.4 install: - if [[ $TRAVIS_OS_NAME == osx ]]; then brew update; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/CMakeLists.txt new/jsoncpp-1.8.4/CMakeLists.txt --- old/jsoncpp-1.8.3/CMakeLists.txt 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/CMakeLists.txt 2017-12-20 22:07:10.000000000 +0100 @@ -59,7 +59,7 @@ #SET( JSONCPP_VERSION_MAJOR X ) #SET( JSONCPP_VERSION_MINOR Y ) #SET( JSONCPP_VERSION_PATCH Z ) -SET( JSONCPP_VERSION 1.8.3 ) +SET( JSONCPP_VERSION 1.8.4 ) jsoncpp_parse_version( ${JSONCPP_VERSION} JSONCPP_VERSION ) #IF(NOT JSONCPP_VERSION_FOUND) # MESSAGE(FATAL_ERROR "Failed to parse version string properly. Expect X.Y.Z") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/README.md new/jsoncpp-1.8.4/README.md --- old/jsoncpp-1.8.3/README.md 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/README.md 2017-12-20 22:07:10.000000000 +0100 @@ -34,16 +34,20 @@ Thanks to David Seifert (@SoapGentoo), we (the maintainers) now use [meson](http://mesonbuild.com/) and [ninja](https://ninja-build.org/) to build for debugging, as well as for continuous integration (see [`travis.sh`](travis.sh) ). Other systems may work, but minor things like version strings might break. First, install both meson (which requires Python3) and ninja. +If you wish to install to a directory other than /usr/local, set an environment variable called DESTDIR with the desired path: + DESTDIR=/path/to/install/dir Then, cd jsoncpp/ - BUILD_TYPE=shared - #BUILD_TYPE=static - LIB_TYPE=debug - #LIB_TYPE=release + BUILD_TYPE=debug + #BUILD_TYPE=release + LIB_TYPE=shared + #LIB_TYPE=static meson --buildtype ${BUILD_TYPE} --default-library ${LIB_TYPE} . build-${LIB_TYPE} ninja -v -C build-${LIB_TYPE} test + cd build-${LIB_TYPE} + sudo ninja install ### Building and testing with other build systems See https://github.com/open-source-parsers/jsoncpp/wiki/Building diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/amalgamate.py new/jsoncpp-1.8.4/amalgamate.py --- old/jsoncpp-1.8.3/amalgamate.py 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/amalgamate.py 2017-12-20 22:07:10.000000000 +0100 @@ -1,9 +1,9 @@ -"""Amalgate json-cpp library sources into a single source and header file. +"""Amalgamate json-cpp library sources into a single source and header file. Works with python2.6+ and python3.4+. Example of invocation (must be invoked from json-cpp top directory): -python amalgate.py +python amalgamate.py """ import os import os.path @@ -50,20 +50,20 @@ def amalgamate_source(source_top_dir=None, target_source_path=None, header_include_path=None): - """Produces amalgated source. + """Produces amalgamated source. Parameters: source_top_dir: top-directory target_source_path: output .cpp path header_include_path: generated header path relative to target_source_path. """ - print("Amalgating header...") + print("Amalgamating header...") header = AmalgamationFile(source_top_dir) - header.add_text("/// Json-cpp amalgated header (http://jsoncpp.sourceforge.net/).") + header.add_text("/// Json-cpp amalgamated header (http://jsoncpp.sourceforge.net/).") header.add_text('/// It is intended to be used with #include "%s"' % header_include_path) header.add_file("LICENSE", wrap_in_comment=True) - header.add_text("#ifndef JSON_AMALGATED_H_INCLUDED") - header.add_text("# define JSON_AMALGATED_H_INCLUDED") - header.add_text("/// If defined, indicates that the source file is amalgated") + header.add_text("#ifndef JSON_AMALGAMATED_H_INCLUDED") + header.add_text("# define JSON_AMALGAMATED_H_INCLUDED") + header.add_text("/// If defined, indicates that the source file is amalgamated") header.add_text("/// to prevent private header inclusion.") header.add_text("#define JSON_IS_AMALGAMATION") header.add_file("include/json/version.h") @@ -75,37 +75,37 @@ header.add_file("include/json/reader.h") header.add_file("include/json/writer.h") header.add_file("include/json/assertions.h") - header.add_text("#endif //ifndef JSON_AMALGATED_H_INCLUDED") + header.add_text("#endif //ifndef JSON_AMALGAMATED_H_INCLUDED") target_header_path = os.path.join(os.path.dirname(target_source_path), header_include_path) - print("Writing amalgated header to %r" % target_header_path) + print("Writing amalgamated header to %r" % target_header_path) header.write_to(target_header_path) base, ext = os.path.splitext(header_include_path) forward_header_include_path = base + "-forwards" + ext - print("Amalgating forward header...") + print("Amalgamating forward header...") header = AmalgamationFile(source_top_dir) - header.add_text("/// Json-cpp amalgated forward header (http://jsoncpp.sourceforge.net/).") + header.add_text("/// Json-cpp amalgamated forward header (http://jsoncpp.sourceforge.net/).") header.add_text('/// It is intended to be used with #include "%s"' % forward_header_include_path) header.add_text("/// This header provides forward declaration for all JsonCpp types.") header.add_file("LICENSE", wrap_in_comment=True) - header.add_text("#ifndef JSON_FORWARD_AMALGATED_H_INCLUDED") - header.add_text("# define JSON_FORWARD_AMALGATED_H_INCLUDED") - header.add_text("/// If defined, indicates that the source file is amalgated") + header.add_text("#ifndef JSON_FORWARD_AMALGAMATED_H_INCLUDED") + header.add_text("# define JSON_FORWARD_AMALGAMATED_H_INCLUDED") + header.add_text("/// If defined, indicates that the source file is amalgamated") header.add_text("/// to prevent private header inclusion.") header.add_text("#define JSON_IS_AMALGAMATION") header.add_file("include/json/config.h") header.add_file("include/json/forwards.h") - header.add_text("#endif //ifndef JSON_FORWARD_AMALGATED_H_INCLUDED") + header.add_text("#endif //ifndef JSON_FORWARD_AMALGAMATED_H_INCLUDED") target_forward_header_path = os.path.join(os.path.dirname(target_source_path), forward_header_include_path) - print("Writing amalgated forward header to %r" % target_forward_header_path) + print("Writing amalgamated forward header to %r" % target_forward_header_path) header.write_to(target_forward_header_path) - print("Amalgating source...") + print("Amalgamating source...") source = AmalgamationFile(source_top_dir) - source.add_text("/// Json-cpp amalgated source (http://jsoncpp.sourceforge.net/).") + source.add_text("/// Json-cpp amalgamated source (http://jsoncpp.sourceforge.net/).") source.add_text('/// It is intended to be used with #include "%s"' % header_include_path) source.add_file("LICENSE", wrap_in_comment=True) source.add_text("") @@ -123,12 +123,12 @@ source.add_file(os.path.join(lib_json, "json_value.cpp")) source.add_file(os.path.join(lib_json, "json_writer.cpp")) - print("Writing amalgated source to %r" % target_source_path) + print("Writing amalgamated source to %r" % target_source_path) source.write_to(target_source_path) def main(): usage = """%prog [options] -Generate a single amalgated source and header file from the sources. +Generate a single amalgamated source and header file from the sources. """ from optparse import OptionParser parser = OptionParser(usage=usage) @@ -136,7 +136,7 @@ parser.add_option("-s", "--source", dest="target_source_path", action="store", default="dist/jsoncpp.cpp", help="""Output .cpp source path. [Default: %default]""") parser.add_option("-i", "--include", dest="header_include_path", action="store", default="json/json.h", - help="""Header include path. Used to include the header from the amalgated source file. [Default: %default]""") + help="""Header include path. Used to include the header from the amalgamated source file. [Default: %default]""") parser.add_option("-t", "--top-dir", dest="top_dir", action="store", default=os.getcwd(), help="""Source top-directory. [Default: %default]""") parser.enable_interspersed_args() @@ -149,7 +149,7 @@ sys.stderr.write(msg + "\n") sys.exit(1) else: - print("Source succesfully amalagated") + print("Source successfully amalgamated") if __name__ == "__main__": main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/dev.makefile new/jsoncpp-1.8.4/dev.makefile --- old/jsoncpp-1.8.3/dev.makefile 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/dev.makefile 2017-12-20 22:07:10.000000000 +0100 @@ -12,7 +12,7 @@ curl https://github.com/open-source-parsers/jsoncpp/archive/$*.tar.gz -o $@ dox: python doxybuild.py --doxygen=$$(which doxygen) --in doc/web_doxyfile.in - rsync -va --delete dist/doxygen/jsoncpp-api-html-${VER}/ ../jsoncpp-docs/doxygen/ + rsync -va -c --delete dist/doxygen/jsoncpp-api-html-${VER}/ ../jsoncpp-docs/doxygen/ # Then 'git add -A' and 'git push' in jsoncpp-docs. build: mkdir -p build/debug diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/doc/doxyfile.in new/jsoncpp-1.8.4/doc/doxyfile.in --- old/jsoncpp-1.8.3/doc/doxyfile.in 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/doc/doxyfile.in 2017-12-20 22:07:10.000000000 +0100 @@ -271,7 +271,7 @@ # parses. With this tag you can assign which parser to use for a given # extension. Doxygen has a built-in mapping, but you can override or extend it # using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# language is one of the parsers supported by doxygen: IDL, Java, JavaScript, # C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make # doxygen treat .inc files as Fortran files (default is PHP), and .f files as C # (default is Fortran), use: inc=Fortran f=C. @@ -984,7 +984,8 @@ # classes, structs, unions or interfaces. # The default value is: YES. -ALPHABETICAL_INDEX = NO +ALPHABETICAL_INDEX = YES +TOC_INCLUDE_HEADINGS = 2 # The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in # which the alphabetical index list will be split. @@ -1407,7 +1408,7 @@ FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# http://www.mathjax.org) which uses client side JavaScript for the rendering # instead of using prerendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1477,7 +1478,7 @@ SEARCHENGINE = NO # When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a web server instead of a web client using Javascript. There +# implemented using a web server instead of a web client using JavaScript. There # are two flavours of web server based searching depending on the # EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for # searching and an index file used by the script. When EXTERNAL_SEARCH is @@ -1958,7 +1959,7 @@ EXPAND_AS_DEFINED = # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will -# remove all refrences to function-like macros that are alone on a line, have an +# remove all references to function-like macros that are alone on a line, have an # all uppercase name, and do not end with a semicolon. Such function macros are # typically used for boiler-plate code, and will confuse the parser if not # removed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/doc/footer.html new/jsoncpp-1.8.4/doc/footer.html --- old/jsoncpp-1.8.3/doc/footer.html 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/doc/footer.html 2017-12-20 22:07:10.000000000 +0100 @@ -1,3 +1,21 @@ -<hr> -</body> + + + +<div id="nav-path" class="navpath"> + <ul> + $navpath + <li class="footer">$generatedby + <a href="http://www.doxygen.org/index.html"> + <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/></a> $doxygenversion </li> + </ul> +</div> + + +<hr class="footer"/><address class="footer"><small> +$generatedby  <a href="http://www.doxygen.org/index.html"> +<img class="footer" src="$relpath^doxygen.png" alt="doxygen"/> +</a> $doxygenversion +</small></address> + +</body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/doc/header.html new/jsoncpp-1.8.4/doc/header.html --- old/jsoncpp-1.8.3/doc/header.html 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/doc/header.html 2017-12-20 22:07:10.000000000 +0100 @@ -1,24 +1,64 @@ -<html> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title> -JsonCpp - JSON data format manipulation library -</title> -<link href="doxygen.css" rel="stylesheet" type="text/css"> -<link href="tabs.css" rel="stylesheet" type="text/css"> +<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/> +<meta http-equiv="X-UA-Compatible" content="IE=9"/> +<meta name="generator" content="Doxygen $doxygenversion"/> +<meta name="viewport" content="width=device-width, initial-scale=1"/> +<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/> +<script type="text/javascript" src="$relpath^jquery.js"></script> +<script type="text/javascript" src="$relpath^dynsections.js"></script> +$treeview +$search +$mathjax +<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" /> +$extrastylesheet </head> +<body> +<div id="top"> -<body bgcolor="#ffffff"> + +<div id="titlearea"> +<table cellspacing="0" cellpadding="0"> + <tbody> + <tr style="height: 56px;"> +  + <td id="projectlogo"><img alt="Logo" src="$relpath^$projectlogo"/></td> +  +  +  + <td>$searchbox</td> +  +  + </tr> + </tbody> +</table> +</div> + +<body bgcolor="#ffffff"> <table width="100%"> <tr> - <td width="40%" align="left" valign="center"> + <td width="30%" align="left" valign="center"> <a href="https://github.com/open-source-parsers/jsoncpp"> JsonCpp project page </a> </td> - <td width="40%" align="right" valign="center"> + <td width="20%" align="center" valign="center"> + <a href="hierarchy.html"> + Classes + </a> + </td> + <td width="20%" align="center" valign="center"> + <a href="namespace_json.html"> + Namespace + </a> + </td> + <td width="30%" align="right" valign="center"> <a href="http://open-source-parsers.github.io/jsoncpp-docs/doxygen/">JsonCpp home page</a> </td> </tr> </table> <hr> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/doc/web_doxyfile.in new/jsoncpp-1.8.4/doc/web_doxyfile.in --- old/jsoncpp-1.8.3/doc/web_doxyfile.in 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/doc/web_doxyfile.in 2017-12-20 22:07:10.000000000 +0100 @@ -44,7 +44,7 @@ # for a project that appears at the top of each page and should give viewer a # quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = +PROJECT_BRIEF = "JSON data format manipulation library" # With the PROJECT_LOGO tag one can specify an logo or icon that is included in # the documentation. The maximum height of the logo should not exceed 55 pixels @@ -271,7 +271,7 @@ # parses. With this tag you can assign which parser to use for a given # extension. Doxygen has a built-in mapping, but you can override or extend it # using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# language is one of the parsers supported by doxygen: IDL, Java, JavaScript, # C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make # doxygen treat .inc files as Fortran files (default is PHP), and .f files as C # (default is Fortran), use: inc=Fortran f=C. @@ -984,7 +984,8 @@ # classes, structs, unions or interfaces. # The default value is: YES. -ALPHABETICAL_INDEX = NO +ALPHABETICAL_INDEX = YES +TOC_INCLUDE_HEADINGS = 2 # The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in # which the alphabetical index list will be split. @@ -1124,7 +1125,7 @@ # The default value is: YES. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_TIMESTAMP = YES +HTML_TIMESTAMP = NO # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the @@ -1360,7 +1361,7 @@ # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. -GENERATE_TREEVIEW = NO +GENERATE_TREEVIEW = YES # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that # doxygen will group on one line in the generated HTML documentation. @@ -1407,7 +1408,7 @@ FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# http://www.mathjax.org) which uses client side JavaScript for the rendering # instead of using prerendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1477,7 +1478,7 @@ SEARCHENGINE = NO # When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a web server instead of a web client using Javascript. There +# implemented using a web server instead of a web client using JavaScript. There # are two flavours of web server based searching depending on the # EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for # searching and an index file used by the script. When EXTERNAL_SEARCH is @@ -1797,18 +1798,6 @@ XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a -# validating XML parser to check the syntax of the XML files. -# This tag requires that the tag GENERATE_XML is set to YES. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify a XML DTD, which can be used by a -# validating XML parser to check the syntax of the XML files. -# This tag requires that the tag GENERATE_XML is set to YES. - -XML_DTD = - # If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program # listings (including syntax highlighting and cross-referencing information) to # the XML output. Note that enabling this will significantly increase the size @@ -1958,7 +1947,7 @@ EXPAND_AS_DEFINED = # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will -# remove all refrences to function-like macros that are alone on a line, have an +# remove all references to function-like macros that are alone on a line, have an # all uppercase name, and do not end with a semicolon. Such function macros are # typically used for boiler-plate code, and will confuse the parser if not # removed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/doxybuild.py new/jsoncpp-1.8.4/doxybuild.py --- old/jsoncpp-1.8.3/doxybuild.py 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/doxybuild.py 2017-12-20 22:07:10.000000000 +0100 @@ -156,7 +156,7 @@ def main(): usage = """%prog Generates doxygen documentation in build/doxygen. - Optionaly makes a tarball of the documentation to dist/. + Optionally makes a tarball of the documentation to dist/. Must be started in the project top directory. """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/include/json/config.h new/jsoncpp-1.8.4/include/json/config.h --- old/jsoncpp-1.8.3/include/json/config.h 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/include/json/config.h 2017-12-20 22:07:10.000000000 +0100 @@ -25,9 +25,9 @@ #define JSON_USE_EXCEPTION 1 #endif -/// If defined, indicates that the source file is amalgated +/// If defined, indicates that the source file is amalgamated /// to prevent private header inclusion. -/// Remarks: it is automatically defined in the generated amalgated header. +/// Remarks: it is automatically defined in the generated amalgamated header. // #define JSON_IS_AMALGAMATION #ifdef JSON_IN_CPPTL @@ -78,7 +78,7 @@ #endif // defined(_MSC_VER) -// In c++11 the override keyword allows you to explicity define that a function +// In c++11 the override keyword allows you to explicitly define that a function // is intended to override the base-class version. This makes the code more // managable and fixes a set of common hard-to-find bugs. #if __cplusplus >= 201103L diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/include/json/value.h new/jsoncpp-1.8.4/include/json/value.h --- old/jsoncpp-1.8.3/include/json/value.h 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/include/json/value.h 2017-12-20 22:07:10.000000000 +0100 @@ -116,7 +116,7 @@ /** \brief Lightweight wrapper to tag static string. * - * Value constructor and objectValue member assignement takes advantage of the + * Value constructor and objectValue member assignment takes advantage of the * StaticString and avoid the cost of string duplication when storing the * string or the member name. * @@ -190,6 +190,9 @@ typedef Json::LargestUInt LargestUInt; typedef Json::ArrayIndex ArrayIndex; + // Required for boost integration, e. g. BOOST_TEST + typedef std::string value_type; + static const Value& null; ///< We regret this reference to a global instance; prefer the simpler Value(). static const Value& nullRef; ///< just a kludge for binary-compatibility; same as null static Value const& nullSingleton(); ///< Prefer this to null or nullRef. @@ -397,8 +400,8 @@ /// otherwise, false. bool empty() const; - /// Return isNull() - bool operator!() const; + /// Return !isNull() + explicit operator bool() const; /// Remove all object members and array elements. /// \pre type() is arrayValue, objectValue, or nullValue @@ -518,13 +521,11 @@ /// \pre type() is objectValue or nullValue /// \post type() is unchanged /// \deprecated - JSONCPP_DEPRECATED("") - Value removeMember(const char* key); + void removeMember(const char* key); /// Same as removeMember(const char*) /// \param key may contain embedded nulls. /// \deprecated - JSONCPP_DEPRECATED("") - Value removeMember(const JSONCPP_STRING& key); + void removeMember(const JSONCPP_STRING& key); /// Same as removeMember(const char* begin, const char* end, Value* removed), /// but 'key' is null-terminated. bool removeMember(const char* key, Value* removed); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/include/json/version.h new/jsoncpp-1.8.4/include/json/version.h --- old/jsoncpp-1.8.3/include/json/version.h 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/include/json/version.h 2017-12-20 22:07:10.000000000 +0100 @@ -3,10 +3,10 @@ #ifndef JSON_VERSION_H_INCLUDED # define JSON_VERSION_H_INCLUDED -# define JSONCPP_VERSION_STRING "1.8.3" +# define JSONCPP_VERSION_STRING "1.8.4" # define JSONCPP_VERSION_MAJOR 1 # define JSONCPP_VERSION_MINOR 8 -# define JSONCPP_VERSION_PATCH 3 +# define JSONCPP_VERSION_PATCH 4 # define JSONCPP_VERSION_QUALIFIER # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/include/json/writer.h new/jsoncpp-1.8.4/include/json/writer.h --- old/jsoncpp-1.8.3/include/json/writer.h 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/include/json/writer.h 2017-12-20 22:07:10.000000000 +0100 @@ -15,7 +15,7 @@ // Disable warning C4251: <data member>: <type> needs to have dll-interface to // be used by... -#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) +#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) && defined(_MSC_VER) #pragma warning(push) #pragma warning(disable : 4251) #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) @@ -99,7 +99,7 @@ - "dropNullPlaceholders": false or true - Drop the "null" string from the writer's output for nullValues. Strictly speaking, this is not valid JSON. But when the output is being - fed to a browser's Javascript, it makes for smaller output and the + fed to a browser's JavaScript, it makes for smaller output and the browser can handle the output just fine. - "useSpecialFloats": false or true - If true, outputs non-finite floating point values in the following way: @@ -156,8 +156,11 @@ * \sa Reader, Value * \deprecated Use StreamWriterBuilder. */ +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4996) // Deriving from deprecated class +#endif class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter : public Writer { - public: FastWriter(); ~FastWriter() JSONCPP_OVERRIDE {} @@ -166,7 +169,7 @@ /** \brief Drop the "null" string from the writer's output for nullValues. * Strictly speaking, this is not valid JSON. But when the output is being - * fed to a browser's Javascript, it makes for smaller output and the + * fed to a browser's JavaScript, it makes for smaller output and the * browser can handle the output just fine. */ void dropNullPlaceholders(); @@ -180,10 +183,13 @@ void writeValue(const Value& value); JSONCPP_STRING document_; - bool yamlCompatiblityEnabled_; + bool yamlCompatibilityEnabled_; bool dropNullPlaceholders_; bool omitEndingLineFeed_; }; +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a *human friendly way. @@ -209,6 +215,10 @@ * \sa Reader, Value, Value::setComment() * \deprecated Use StreamWriterBuilder. */ +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4996) // Deriving from deprecated class +#endif class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWriter : public Writer { public: StyledWriter(); @@ -224,7 +234,7 @@ private: void writeValue(const Value& value); void writeArrayValue(const Value& value); - bool isMultineArray(const Value& value); + bool isMultilineArray(const Value& value); void pushValue(const JSONCPP_STRING& value); void writeIndent(); void writeWithIndent(const JSONCPP_STRING& value); @@ -244,6 +254,9 @@ unsigned int indentSize_; bool addChildValues_; }; +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way, @@ -270,6 +283,10 @@ * \sa Reader, Value, Value::setComment() * \deprecated Use StreamWriterBuilder. */ +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4996) // Deriving from deprecated class +#endif class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledStreamWriter { public: /** @@ -290,7 +307,7 @@ private: void writeValue(const Value& value); void writeArrayValue(const Value& value); - bool isMultineArray(const Value& value); + bool isMultilineArray(const Value& value); void pushValue(const JSONCPP_STRING& value); void writeIndent(); void writeWithIndent(const JSONCPP_STRING& value); @@ -311,6 +328,9 @@ bool addChildValues_ : 1; bool indented_ : 1; }; +#if defined(_MSC_VER) +#pragma warning(pop) +#endif #if defined(JSON_HAS_INT64) JSONCPP_STRING JSON_API valueToString(Int value); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/makerelease.py new/jsoncpp-1.8.4/makerelease.py --- old/jsoncpp-1.8.3/makerelease.py 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/makerelease.py 2017-12-20 22:07:10.000000000 +0100 @@ -265,7 +265,7 @@ Must be started in the project top directory. -Warning: --force should only be used when developping/testing the release script. +Warning: --force should only be used when developing/testing the release script. """ from optparse import OptionParser parser = OptionParser(usage=usage) @@ -377,7 +377,7 @@ user=options.user, sftp=options.sftp) print('Source and doc release tarballs uploaded') else: - print('No upload user specified. Web site and download tarbal were not uploaded.') + print('No upload user specified. Web site and download tarball were not uploaded.') print('Tarball can be found at:', doc_tarball_path) # Set next version number and commit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/meson.build new/jsoncpp-1.8.4/meson.build --- old/jsoncpp-1.8.3/meson.build 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/meson.build 2017-12-20 22:07:10.000000000 +0100 @@ -1,7 +1,7 @@ project( 'jsoncpp', 'cpp', - version : '1.8.3', + version : '1.8.4', default_options : [ 'buildtype=release', 'warning_level=1'], @@ -18,6 +18,7 @@ jsoncpp_cdata.set('JSONCPP_VERSION_MAJOR', jsoncpp_major_version) jsoncpp_cdata.set('JSONCPP_VERSION_MINOR', jsoncpp_minor_version) jsoncpp_cdata.set('JSONCPP_VERSION_PATCH', jsoncpp_patch_version) +jsoncpp_cdata.set('JSONCPP_USE_SECURE_MEMORY',0) jsoncpp_gen_sources = configure_file( input : 'src/lib_json/version.h.in', @@ -52,7 +53,7 @@ 'src/lib_json/json_reader.cpp', 'src/lib_json/json_value.cpp', 'src/lib_json/json_writer.cpp'], - soversion : 19, + soversion : 20, install : true, include_directories : jsoncpp_include_directories) @@ -64,7 +65,7 @@ description : 'A C++ library for interacting with JSON') # for libraries bundling jsoncpp -declare_dependency( +jsoncpp_dep = declare_dependency( include_directories : jsoncpp_include_directories, link_with : jsoncpp_lib, version : meson.project_version(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/src/jsontestrunner/main.cpp new/jsoncpp-1.8.4/src/jsontestrunner/main.cpp --- old/jsoncpp-1.8.3/src/jsontestrunner/main.cpp 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/src/jsontestrunner/main.cpp 2017-12-20 22:07:10.000000000 +0100 @@ -3,8 +3,12 @@ // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE +#if defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#elif defined(_MSC_VER) +#pragma warning(disable : 4996) +#endif /* This executable is used for testing parser/writer using real JSON files. */ @@ -14,10 +18,6 @@ #include <sstream> #include <stdio.h> -#if defined(_MSC_VER) && _MSC_VER >= 1310 -#pragma warning(disable : 4996) // disable fopen deprecation warning -#endif - struct Options { JSONCPP_STRING path; @@ -328,4 +328,6 @@ } } +#if defined(__GNUC__) #pragma GCC diagnostic pop +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/src/lib_json/json_reader.cpp new/jsoncpp-1.8.4/src/lib_json/json_reader.cpp --- old/jsoncpp-1.8.3/src/lib_json/json_reader.cpp 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/src/lib_json/json_reader.cpp 2017-12-20 22:07:10.000000000 +0100 @@ -1237,7 +1237,7 @@ token.type_ = tokenString; ok = readStringSingleQuote(); break; - } // else continue + } // else fall through case '/': token.type_ = tokenComment; ok = readComment(); @@ -2052,10 +2052,6 @@ JSONCPP_STRING errs; bool ok = parseFromStream(b, sin, &root, &errs); if (!ok) { - fprintf(stderr, - "Error from reader: %s", - errs.c_str()); - throwRuntimeError(errs); } return sin; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/src/lib_json/json_tool.h new/jsoncpp-1.8.4/src/lib_json/json_tool.h --- old/jsoncpp-1.8.3/src/lib_json/json_tool.h 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/src/lib_json/json_tool.h 2017-12-20 22:07:10.000000000 +0100 @@ -61,9 +61,6 @@ return result; } -/// Returns true if ch is a control character (in range [1,31]). -static inline bool isControlCharacter(char ch) { return ch > 0 && ch <= 0x1F; } - enum { /// Constant that specify the size of the buffer that must be passed to /// uintToString. @@ -74,7 +71,7 @@ typedef char UIntToStringBuffer[uintToStringBufferSize]; /** Converts an unsigned integer to string. - * @param value Unsigned interger to convert to string + * @param value Unsigned integer to convert to string * @param current Input/Output string buffer. * Must have at least uintToStringBufferSize chars free. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/src/lib_json/json_value.cpp new/jsoncpp-1.8.4/src/lib_json/json_value.cpp --- old/jsoncpp-1.8.3/src/lib_json/json_value.cpp 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/src/lib_json/json_value.cpp 2017-12-20 22:07:10.000000000 +0100 @@ -962,7 +962,7 @@ return false; } -bool Value::operator!() const { return isNull(); } +Value::operator bool() const { return ! isNull(); } void Value::clear() { JSON_ASSERT_MESSAGE(type_ == nullValue || type_ == arrayValue || @@ -1148,7 +1148,7 @@ Value& Value::append(const Value& value) { return (*this)[size()] = value; } #if JSON_HAS_RVALUE_REFERENCES - Value& Value::append(Value&& value) { return (*this)[size()] = value; } + Value& Value::append(Value&& value) { return (*this)[size()] = std::move(value); } #endif Value Value::get(char const* key, char const* cend, Value const& defaultValue) const @@ -1187,20 +1187,19 @@ { return removeMember(key.data(), key.data() + key.length(), removed); } -Value Value::removeMember(const char* key) +void Value::removeMember(const char* key) { JSON_ASSERT_MESSAGE(type_ == nullValue || type_ == objectValue, "in Json::Value::removeMember(): requires objectValue"); if (type_ == nullValue) - return nullSingleton(); + return; - Value removed; // null - removeMember(key, key + strlen(key), &removed); - return removed; // still null if removeMember() did nothing + CZString actualKey(key, unsigned(strlen(key)), CZString::noDuplication); + value_.map_->erase(actualKey); } -Value Value::removeMember(const JSONCPP_STRING& key) +void Value::removeMember(const JSONCPP_STRING& key) { - return removeMember(key.c_str()); + removeMember(key.c_str()); } bool Value::removeIndex(ArrayIndex index, Value* removed) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/src/lib_json/json_writer.cpp new/jsoncpp-1.8.4/src/lib_json/json_writer.cpp --- old/jsoncpp-1.8.3/src/lib_json/json_writer.cpp 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/src/lib_json/json_writer.cpp 2017-12-20 22:07:10.000000000 +0100 @@ -81,24 +81,6 @@ typedef std::auto_ptr<StreamWriter> StreamWriterPtr; #endif -static bool containsControlCharacter(const char* str) { - while (*str) { - if (isControlCharacter(*(str++))) - return true; - } - return false; -} - -static bool containsControlCharacter0(const char* str, unsigned len) { - char const* end = str + len; - while (end != str) { - if (isControlCharacter(*str) || 0==*str) - return true; - ++str; - } - return false; -} - JSONCPP_STRING valueToString(LargestInt value) { UIntToStringBuffer buffer; char* current = buffer + sizeof(buffer); @@ -143,10 +125,10 @@ int len = -1; char formatString[15]; - snprintf(formatString, sizeof(formatString), "%%.%dg", precision); + snprintf(formatString, sizeof(formatString), "%%.%ug", precision); // Print into the buffer. We need not request the alternative representation - // that always has a decimal point because JSON doesn't distingish the + // that always has a decimal point because JSON doesn't distinguish the // concepts of reals and integers. if (isfinite(value)) { len = snprintf(buffer, sizeof(buffer), formatString, value); @@ -176,89 +158,103 @@ JSONCPP_STRING valueToString(bool value) { return value ? "true" : "false"; } -JSONCPP_STRING valueToQuotedString(const char* value) { - if (value == NULL) - return ""; - // Not sure how to handle unicode... - if (strpbrk(value, "\"\\\b\f\n\r\t") == NULL && - !containsControlCharacter(value)) - return JSONCPP_STRING("\"") + value + "\""; - // We have to walk value and escape any special characters. - // Appending to JSONCPP_STRING is not efficient, but this should be rare. - // (Note: forward slashes are *not* rare, but I am not escaping them.) - JSONCPP_STRING::size_type maxsize = - strlen(value) * 2 + 3; // allescaped+quotes+NULL - JSONCPP_STRING result; - result.reserve(maxsize); // to avoid lots of mallocs - result += "\""; - for (const char* c = value; *c != 0; ++c) { - switch (*c) { - case '\"': - result += "\\\""; - break; - case '\\': - result += "\\\\"; - break; - case '\b': - result += "\\b"; - break; - case '\f': - result += "\\f"; - break; - case '\n': - result += "\\n"; - break; - case '\r': - result += "\\r"; - break; - case '\t': - result += "\\t"; - break; - // case '/': - // Even though \/ is considered a legal escape in JSON, a bare - // slash is also legal, so I see no reason to escape it. - // (I hope I am not misunderstanding something. - // blep notes: actually escaping \/ may be useful in javascript to avoid </ - // sequence. - // Should add a flag to allow this compatibility mode and prevent this - // sequence from occurring. - default: - if (isControlCharacter(*c)) { - JSONCPP_OSTRINGSTREAM oss; - oss << "\\u" << std::hex << std::uppercase << std::setfill('0') - << std::setw(4) << static_cast<int>(*c); - result += oss.str(); - } else { - result += *c; - } - break; - } - } - result += "\""; - return result; -} - -// https://github.com/upcaste/upcaste/blob/master/src/upcore/src/cstring/strnp… -static char const* strnpbrk(char const* s, char const* accept, size_t n) { - assert((s || !n) && accept); +static bool isAnyCharRequiredQuoting(char const* s, size_t n) { + assert(s || !n); char const* const end = s + n; for (char const* cur = s; cur < end; ++cur) { - int const c = *cur; - for (char const* a = accept; *a; ++a) { - if (*a == c) { - return cur; - } - } + if (*cur == '\\' || *cur == '\"' || *cur < ' ' + || static_cast<unsigned char>(*cur) < 0x80) + return true; } - return NULL; + return false; +} + +static unsigned int utf8ToCodepoint(const char*& s, const char* e) { + const unsigned int REPLACEMENT_CHARACTER = 0xFFFD; + + unsigned int firstByte = static_cast<unsigned char>(*s); + + if (firstByte < 0x80) + return firstByte; + + if (firstByte < 0xE0) { + if (e - s < 2) + return REPLACEMENT_CHARACTER; + + unsigned int calculated = ((firstByte & 0x1F) << 6) + | (static_cast<unsigned int>(s[1]) & 0x3F); + s += 1; + // oversized encoded characters are invalid + return calculated < 0x80 ? REPLACEMENT_CHARACTER : calculated; + } + + if (firstByte < 0xF0) { + if (e - s < 3) + return REPLACEMENT_CHARACTER; + + unsigned int calculated = ((firstByte & 0x0F) << 12) + | ((static_cast<unsigned int>(s[1]) & 0x3F) << 6) + | (static_cast<unsigned int>(s[2]) & 0x3F); + s += 2; + // surrogates aren't valid codepoints itself + // shouldn't be UTF-8 encoded + if (calculated >= 0xD800 && calculated <= 0xDFFF) + return REPLACEMENT_CHARACTER; + // oversized encoded characters are invalid + return calculated < 0x800 ? REPLACEMENT_CHARACTER : calculated; + } + + if (firstByte < 0xF8) { + if (e - s < 4) + return REPLACEMENT_CHARACTER; + + unsigned int calculated = ((firstByte & 0x07) << 24) + | ((static_cast<unsigned int>(s[1]) & 0x3F) << 12) + | ((static_cast<unsigned int>(s[2]) & 0x3F) << 6) + | (static_cast<unsigned int>(s[3]) & 0x3F); + s += 3; + // oversized encoded characters are invalid + return calculated < 0x10000 ? REPLACEMENT_CHARACTER : calculated; + } + + return REPLACEMENT_CHARACTER; +} + +static const char hex2[] = + "000102030405060708090a0b0c0d0e0f" + "101112131415161718191a1b1c1d1e1f" + "202122232425262728292a2b2c2d2e2f" + "303132333435363738393a3b3c3d3e3f" + "404142434445464748494a4b4c4d4e4f" + "505152535455565758595a5b5c5d5e5f" + "606162636465666768696a6b6c6d6e6f" + "707172737475767778797a7b7c7d7e7f" + "808182838485868788898a8b8c8d8e8f" + "909192939495969798999a9b9c9d9e9f" + "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf" + "b0b1b2b3b4b5b6b7b8b9babbbcbdbebf" + "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf" + "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf" + "e0e1e2e3e4e5e6e7e8e9eaebecedeeef" + "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"; + +static JSONCPP_STRING toHex16Bit(unsigned int x) { + const unsigned int hi = (x >> 8) & 0xff; + const unsigned int lo = x & 0xff; + JSONCPP_STRING result(4, ' '); + result[0] = hex2[2 * hi]; + result[1] = hex2[2 * hi + 1]; + result[2] = hex2[2 * lo]; + result[3] = hex2[2 * lo + 1]; + return result; } + static JSONCPP_STRING valueToQuotedStringN(const char* value, unsigned length) { if (value == NULL) return ""; - // Not sure how to handle unicode... - if (strnpbrk(value, "\"\\\b\f\n\r\t", length) == NULL && - !containsControlCharacter0(value, length)) + + if (!isAnyCharRequiredQuoting(value, length)) return JSONCPP_STRING("\"") + value + "\""; // We have to walk value and escape any special characters. // Appending to JSONCPP_STRING is not efficient, but this should be rare. @@ -300,14 +296,24 @@ // sequence. // Should add a flag to allow this compatibility mode and prevent this // sequence from occurring. - default: - if ((isControlCharacter(*c)) || (*c == 0)) { - JSONCPP_OSTRINGSTREAM oss; - oss << "\\u" << std::hex << std::uppercase << std::setfill('0') - << std::setw(4) << static_cast<int>(*c); - result += oss.str(); - } else { - result += *c; + default: { + unsigned int cp = utf8ToCodepoint(c, end); + // don't escape non-control characters + // (short escape sequence are applied above) + if (cp < 0x80 && cp >= 0x20) + result += static_cast<char>(cp); + else if (cp < 0x10000) { // codepoint is in Basic Multilingual Plane + result += "\\u"; + result += toHex16Bit(cp); + } + else { // codepoint is not in Basic Multilingual Plane + // convert to surrogate pair first + cp -= 0x10000; + result += "\\u"; + result += toHex16Bit((cp >> 10) + 0xD800); + result += "\\u"; + result += toHex16Bit((cp & 0x3FF) + 0xDC00); + } } break; } @@ -316,6 +322,10 @@ return result; } +JSONCPP_STRING valueToQuotedString(const char* value) { + return valueToQuotedStringN(value, static_cast<unsigned int>(strlen(value))); +} + // Class Writer // ////////////////////////////////////////////////////////////////// Writer::~Writer() {} @@ -324,10 +334,10 @@ // ////////////////////////////////////////////////////////////////// FastWriter::FastWriter() - : yamlCompatiblityEnabled_(false), dropNullPlaceholders_(false), + : yamlCompatibilityEnabled_(false), dropNullPlaceholders_(false), omitEndingLineFeed_(false) {} -void FastWriter::enableYAMLCompatibility() { yamlCompatiblityEnabled_ = true; } +void FastWriter::enableYAMLCompatibility() { yamlCompatibilityEnabled_ = true; } void FastWriter::dropNullPlaceholders() { dropNullPlaceholders_ = true; } @@ -387,7 +397,7 @@ if (it != members.begin()) document_ += ','; document_ += valueToQuotedStringN(name.data(), static_cast<unsigned>(name.length())); - document_ += yamlCompatiblityEnabled_ ? ": " : ":"; + document_ += yamlCompatibilityEnabled_ ? ": " : ":"; writeValue(value[name]); } document_ += '}'; @@ -476,7 +486,7 @@ if (size == 0) pushValue("[]"); else { - bool isArrayMultiLine = isMultineArray(value); + bool isArrayMultiLine = isMultilineArray(value); if (isArrayMultiLine) { writeWithIndent("["); indent(); @@ -514,7 +524,7 @@ } } -bool StyledWriter::isMultineArray(const Value& value) { +bool StyledWriter::isMultilineArray(const Value& value) { ArrayIndex const size = value.size(); bool isMultiLine = size * 3 >= rightMargin_; childValues_.clear(); @@ -693,7 +703,7 @@ if (size == 0) pushValue("[]"); else { - bool isArrayMultiLine = isMultineArray(value); + bool isArrayMultiLine = isMultilineArray(value); if (isArrayMultiLine) { writeWithIndent("["); indent(); @@ -733,7 +743,7 @@ } } -bool StyledStreamWriter::isMultineArray(const Value& value) { +bool StyledStreamWriter::isMultilineArray(const Value& value) { ArrayIndex const size = value.size(); bool isMultiLine = size * 3 >= rightMargin_; childValues_.clear(); @@ -850,7 +860,7 @@ private: void writeValue(Value const& value); void writeArrayValue(Value const& value); - bool isMultineArray(Value const& value); + bool isMultilineArray(Value const& value); void pushValue(JSONCPP_STRING const& value); void writeIndent(); void writeWithIndent(JSONCPP_STRING const& value); @@ -974,7 +984,7 @@ if (size == 0) pushValue("[]"); else { - bool isMultiLine = (cs_ == CommentStyle::All) || isMultineArray(value); + bool isMultiLine = (cs_ == CommentStyle::All) || isMultilineArray(value); if (isMultiLine) { writeWithIndent("["); indent(); @@ -1016,7 +1026,7 @@ } } -bool BuiltStyledStreamWriter::isMultineArray(Value const& value) { +bool BuiltStyledStreamWriter::isMultilineArray(Value const& value) { ArrayIndex const size = value.size(); bool isMultiLine = size * 3 >= rightMargin_; childValues_.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/src/test_lib_json/jsontest.cpp new/jsoncpp-1.8.4/src/test_lib_json/jsontest.cpp --- old/jsoncpp-1.8.3/src/test_lib_json/jsontest.cpp 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/src/test_lib_json/jsontest.cpp 2017-12-20 22:07:10.000000000 +0100 @@ -398,7 +398,7 @@ _CrtSetReportHook(&msvcrtSilentReportHook); #endif // if defined(_MSC_VER) -// @todo investiguate this handler (for buffer overflow) +// @todo investigate this handler (for buffer overflow) // _set_security_error_handler #if defined(_WIN32) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/src/test_lib_json/main.cpp new/jsoncpp-1.8.4/src/test_lib_json/main.cpp --- old/jsoncpp-1.8.3/src/test_lib_json/main.cpp 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/src/test_lib_json/main.cpp 2017-12-20 22:07:10.000000000 +0100 @@ -3,8 +3,12 @@ // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE +#if defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#elif defined(_MSC_VER) +#pragma warning(disable : 4996) +#endif #include "jsontest.h" #include <json/config.h> @@ -304,6 +308,12 @@ JSONTEST_ASSERT_STRING_EQUAL("", null_.asString()); JSONTEST_ASSERT_EQUAL(Json::Value::null, null_); + + // Test using a Value in a boolean context (false iff null) + JSONTEST_ASSERT_EQUAL(null_,false); + JSONTEST_ASSERT_EQUAL(object1_,true); + JSONTEST_ASSERT_EQUAL(!null_,true); + JSONTEST_ASSERT_EQUAL(!object1_,false); } JSONTEST_FIXTURE(ValueTest, strings) { @@ -2036,7 +2046,7 @@ } } JSONTEST_FIXTURE(CharReaderFailIfExtraTest, issue107) { - // This is interpretted as an int value followed by a colon. + // This is interpreted as an int value followed by a colon. Json::CharReaderBuilder b; Json::Value root; char const doc[] = @@ -2591,4 +2601,6 @@ return runner.runCommandLine(argc, argv); } +#if defined(__GNUC__) #pragma GCC diagnostic pop +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.8.3/version new/jsoncpp-1.8.4/version --- old/jsoncpp-1.8.3/version 2017-08-28 16:11:00.000000000 +0200 +++ new/jsoncpp-1.8.4/version 2017-12-20 22:07:10.000000000 +0100 @@ -1 +1 @@ -1.8.3 +1.8.4

1 0

commit libxkbcommon for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '17

30 Dec '17

Hello community, here is the log from the commit of package libxkbcommon for openSUSE:Factory checked in at 2017-12-31 00:43:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxkbcommon (Old) and /work/SRC/openSUSE:Factory/.libxkbcommon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libxkbcommon" Sun Dec 31 00:43:20 2017 rev:21 rq:559511 version:0.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libxkbcommon/libxkbcommon.changes 2017-10-28 14:17:09.961464556 +0200 +++ /work/SRC/openSUSE:Factory/.libxkbcommon.new/libxkbcommon.changes 2017-12-31 00:43:30.083850824 +0100 @@ -1,0 +2,17 @@ +Fri Dec 15 20:21:18 UTC 2017 - jengelh(a)inai.de + +- Update to new upstream release 0.8.0 + * Added xkb_keysym_to_{upper,lower} to perform case-conversion + directly on keysyms. This is useful in some odd cases, but + working with the Unicode representations should be preferred + when possible. + * Added Unicode conversion rules for the signifblank and + permille keysyms. + * Fixed a bug in the parsing of XKB key type definitions where + the number of levels were determined by the number of level + *names*. Keymaps which omit level names were hence + miscompiled. This regressed in version 0.4.3. Keymaps from + xkeyboard-config were not affected since they don't omit + level names. + +------------------------------------------------------------------- Old: ---- libxkbcommon-0.7.2.tar.xz New: ---- libxkbcommon-0.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxkbcommon.spec ++++++ --- /var/tmp/diff_new_pack.qKtMbf/_old 2017-12-31 00:43:30.815606751 +0100 +++ /var/tmp/diff_new_pack.qKtMbf/_new 2017-12-31 00:43:30.819605417 +0100 @@ -23,7 +23,7 @@ %endif Name: libxkbcommon -Version: 0.7.2 +Version: 0.8.0 Release: 0 Summary: Library for handling xkb descriptions License: MIT ++++++ libxkbcommon-0.7.2.tar.xz -> libxkbcommon-0.8.0.tar.xz ++++++ ++++ 7347 lines of diff (skipped)

1 0

commit wxWidgets-3_0 for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '17

30 Dec '17

Hello community, here is the log from the commit of package wxWidgets-3_0 for openSUSE:Factory checked in at 2017-12-31 00:43:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxWidgets-3_0 (Old) and /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wxWidgets-3_0" Sun Dec 31 00:43:06 2017 rev:22 rq:559505 version:3.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/wxWidgets-3_0/wxWidgets-3_0-nostl.changes 2017-10-17 01:50:01.737430776 +0200 +++ /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new/wxWidgets-3_0-nostl.changes 2017-12-31 00:43:09.294784911 +0100 @@ -1,0 +2,13 @@ +Fri Dec 15 19:52:16 UTC 2017 - jengelh(a)inai.de + +- Rework language package dependencies with base library. +- Replace otherproviders() by regular Conflicts. + +------------------------------------------------------------------- +Sat Oct 21 09:33:29 UTC 2017 - martin.koegler(a)chello.at + +- Unify packaging +- Backport spinctrl patches: 0001-spinctrl.patch + 0002-spinctrl.patch + +------------------------------------------------------------------- wxWidgets-3_0.changes: same change New: ---- 0001-spinctrl.patch 0002-spinctrl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxWidgets-3_0-nostl.spec ++++++ --- /var/tmp/diff_new_pack.lWCNib/_old 2017-12-31 00:43:13.377423167 +0100 +++ /var/tmp/diff_new_pack.lWCNib/_new 2017-12-31 00:43:13.381421834 +0100 @@ -17,19 +17,20 @@ Name: wxWidgets-3_0-nostl -%define base_name wxWidgets +%define base_name wxWidgets-3_0 %define tarball_name wxWidgets +%define variant suse-nostl +%define sonum 3 Version: 3.0.3 Release: 0 %define wx_minor 3.0 # libdir for installing of all the stuff %define wxlibdir %_libdir -# lang packages are exactly equal for all variants. Build it only once: -%if "%name" == "%base_name" -%define BUILD_LANG 1 -%else +# lang packages are exactly equal for all variants and versions. +# coordinate a bit between nostl and wxWidgets-3_x. %define BUILD_LANG 0 -%endif +# build non-UI toolkit related packages +%define base_packages 1 Summary: C++ Library for Cross-Platform Development License: GPL-2.0+ Group: Development/Libraries/C and C++ @@ -45,8 +46,16 @@ Source50: baselibs.conf Patch1: soversion.diff Patch17: relax-abi.diff +Patch18: 0001-spinctrl.patch +Patch19: 0002-spinctrl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: SDL-devel + +#Link SDL2 for newer distros +%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) +BuildRequires: pkgconfig(sdl2) +%else +BuildRequires: pkgconfig(sdl) +%endif BuildRequires: autoconf BuildRequires: cppunit-devel BuildRequires: gcc-c++ @@ -78,9 +87,10 @@ This varaint of wxWidgets is built without STL types (such as std::string), and is provided for old programs which fail to use e.g. -wxString and instead rely on wxChar pointer API. +wxString and instead rely on the wxChar pointer API. -%package -n libwx_baseu-suse-nostl3 +%if %base_packages +%package -n libwx_baseu-%variant%sonum Summary: wxWidgets Library # Name up to openSUSE 11.3 and up to wxGTK-2.8: Group: System/Libraries @@ -89,142 +99,141 @@ Obsoletes: wxWidgets < %version # wxWidgets-lang requires wxWidgets. Provide them to fix dependencies: Provides: wxWidgets = %version -Recommends: %base_name-lang >= %version +Recommends: wxWidgets-lang >= %version -%description -n libwx_baseu-suse-nostl3 +%description -n libwx_baseu-%variant%sonum Library for the wxWidgets cross-platform GUI. This varaint of wxWidgets is built without STL types (such as std::string), and is provided for old programs which fail to use e.g. -wxString and instead rely on wxChar pointer API. +wxString and instead rely on the wxChar pointer API. -%package -n libwx_baseu_net-suse-nostl3 +%package -n libwx_baseu_net-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_baseu_net-suse-nostl3 +%description -n libwx_baseu_net-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_baseu_xml-suse-nostl3 +%package -n libwx_baseu_xml-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_baseu_xml-suse-nostl3 +%description -n libwx_baseu_xml-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk2u_adv-suse-nostl3 +%endif + +%package -n libwx_gtk%{gtk_version}u_adv-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk2u_adv-suse-nostl3 +%description -n libwx_gtk%{gtk_version}u_adv-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk2u_aui-suse-nostl3 +%package -n libwx_gtk%{gtk_version}u_aui-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk2u_aui-suse-nostl3 +%description -n libwx_gtk%{gtk_version}u_aui-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk2u_core-suse-nostl3 +%package -n libwx_gtk%{gtk_version}u_core-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk2u_core-suse-nostl3 +%description -n libwx_gtk%{gtk_version}u_core-%variant%sonum Library for the wxWidgets cross-platform GUI. This varaint of wxWidgets is built without STL types (such as std::string), and is provided for old programs which fail to use e.g. -wxString and instead rely on wxChar pointer API. +wxString and instead rely on the wxChar pointer API. -%package -n libwx_gtk2u_gl-suse-nostl3 +%package -n libwx_gtk%{gtk_version}u_gl-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk2u_gl-suse-nostl3 +%description -n libwx_gtk%{gtk_version}u_gl-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk2u_html-suse-nostl3 +%package -n libwx_gtk%{gtk_version}u_html-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk2u_html-suse-nostl3 +%description -n libwx_gtk%{gtk_version}u_html-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk2u_media-suse-nostl3 +%package -n libwx_gtk%{gtk_version}u_media-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk2u_media-suse-nostl3 +%description -n libwx_gtk%{gtk_version}u_media-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk2u_propgrid-suse-nostl3 +%package -n libwx_gtk%{gtk_version}u_propgrid-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk2u_propgrid-suse-nostl3 +%description -n libwx_gtk%{gtk_version}u_propgrid-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk2u_qa-suse-nostl3 +%package -n libwx_gtk%{gtk_version}u_qa-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk2u_qa-suse-nostl3 +%description -n libwx_gtk%{gtk_version}u_qa-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk2u_ribbon-suse-nostl3 +%package -n libwx_gtk%{gtk_version}u_ribbon-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk2u_ribbon-suse-nostl3 +%description -n libwx_gtk%{gtk_version}u_ribbon-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk2u_richtext-suse-nostl3 +%package -n libwx_gtk%{gtk_version}u_richtext-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk2u_richtext-suse-nostl3 +%description -n libwx_gtk%{gtk_version}u_richtext-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk2u_stc-suse-nostl3 +%package -n libwx_gtk%{gtk_version}u_stc-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk2u_stc-suse-nostl3 +%description -n libwx_gtk%{gtk_version}u_stc-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk2u_xrc-suse-nostl3 +%package -n libwx_gtk%{gtk_version}u_xrc-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk2u_xrc-suse-nostl3 +%description -n libwx_gtk%{gtk_version}u_xrc-%variant%sonum Library for the wxWidgets cross-platform GUI. %package devel Summary: Everything needed for development with wxWidgets Group: Development/Libraries/C and C++ Requires: gtk%gtk_version-devel -Requires: libwx_baseu-suse-nostl3 = %version -Requires: libwx_baseu_net-suse-nostl3 = %version -Requires: libwx_baseu_xml-suse-nostl3 = %version -Requires: libwx_gtk2u_adv-suse-nostl3 = %version -Requires: libwx_gtk2u_aui-suse-nostl3 = %version -Requires: libwx_gtk2u_core-suse-nostl3 = %version -Requires: libwx_gtk2u_gl-suse-nostl3 = %version -Requires: libwx_gtk2u_html-suse-nostl3 = %version -Requires: libwx_gtk2u_media-suse-nostl3 = %version -Requires: libwx_gtk2u_propgrid-suse-nostl3 = %version -Requires: libwx_gtk2u_qa-suse-nostl3 = %version -Requires: libwx_gtk2u_ribbon-suse-nostl3 = %version -Requires: libwx_gtk2u_richtext-suse-nostl3 = %version -Requires: libwx_gtk2u_stc-suse-nostl3 = %version -Requires: libwx_gtk2u_xrc-suse-nostl3 = %version +Requires: libwx_baseu-%variant%sonum = %version +Requires: libwx_baseu_net-%variant%sonum = %version +Requires: libwx_baseu_xml-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_adv-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_aui-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_core-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_gl-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_html-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_media-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_propgrid-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_qa-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_ribbon-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_richtext-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_stc-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_xrc-%variant%sonum = %version Requires: pkgconfig(gl) Requires: pkgconfig(glu) -Conflicts: wxWidgets-3_0-devel >= %version-%release -Conflicts: wxGTK3-3_0-devel >= %version-%release -Conflicts: otherproviders(wxWidgets-devel) -Conflicts: wxWidgets-experimental-devel +Conflicts: wxWidgets-devel %description devel wxWidgets is a free C++ library for cross-platform GUI development. @@ -236,15 +245,22 @@ Note: wxWidgets variant devel packages are mutually exclusive. Please read %_docdir/%name/README.SUSE to pick a correct variant. -%if %BUILD_LANG -%lang_package -n %base_name -%endif +%package -n wxWidgets-lang +Summary: Translations for wxWidgets +Group: System/Localization +Provides: wxWidgets-lang-all = %version +BuildArch: noarch + +%description -n wxWidgets-lang +Provides translations for wxWidgets. %prep echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %tarball_name-%version %patch -P 1 -p1 %patch -P 17 -p1 +%patch -P 18 -p1 +%patch -P 19 -p1 cp %{S:2} . %build @@ -254,8 +270,12 @@ # --enable-accessibility is currently supported only in msw # --enable-extended_rtti does not compile +%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) +export SDL_CONFIG=%_bindir/sdl2-config +%endif + %configure\ - --enable-vendor=suse-nostl \ + --enable-vendor=%variant \ --with-gtk=%gtk_version\ --disable-static\ --enable-unicode\ @@ -280,10 +300,17 @@ cd .. %endif +%clean +: + %install -#Change the suffix from suse to nostl for non STL build -export VENDORTAG='-${VENDOR}-nostl' # only needed for non-MSW +export VENDORTAG='-$variant' # only needed for non-MSW make install DESTDIR="%buildroot" +%if !0%{?base_packages} +# Drop libraries already supplied by another packages +rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \ + "%buildroot/%_libdir/wx/%wx_minor"/sound_sdlu-*.so +%endif %if %BUILD_LANG # Locales for MS Windows: rm -Rf %buildroot/%_datadir/locale/*/LC_MESSAGES/wxmsw.mo @@ -295,101 +322,104 @@ # HACK: Fix wx-config symlink (bug introduced in 2.9.4). ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config -%post -n libwx_baseu-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_baseu-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_baseu_net-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_baseu_net-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_baseu_xml-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_baseu_xml-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_gtk2u_adv-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_gtk2u_adv-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_gtk2u_aui-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_gtk2u_aui-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_gtk2u_core-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_gtk2u_core-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_gtk2u_gl-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_gtk2u_gl-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_gtk2u_html-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_gtk2u_html-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_gtk2u_media-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_gtk2u_media-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_gtk2u_propgrid-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_gtk2u_propgrid-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_gtk2u_qa-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_gtk2u_qa-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_gtk2u_ribbon-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_gtk2u_ribbon-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_gtk2u_richtext-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_gtk2u_richtext-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_gtk2u_stc-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_gtk2u_stc-suse-nostl3 -p /sbin/ldconfig -%post -n libwx_gtk2u_xrc-suse-nostl3 -p /sbin/ldconfig -%postun -n libwx_gtk2u_xrc-suse-nostl3 -p /sbin/ldconfig +%if %base_packages +%post -n libwx_baseu-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig +%post -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig +%post -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig +%endif +%post -n libwx_gtk%{gtk_version}u_adv-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_adv-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_aui-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_aui-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_core-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_core-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_gl-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_gl-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_html-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_html-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_media-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_media-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_propgrid-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_propgrid-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_qa-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_qa-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_ribbon-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_ribbon-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_richtext-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_richtext-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_stc-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_stc-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_xrc-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_xrc-%variant%sonum -p /sbin/ldconfig %if %BUILD_LANG - -%files lang -f wxstd.lang +%files -n wxWidgets-lang -f wxstd.lang %endif -%files -n libwx_baseu-suse-nostl3 +%if %base_packages +%files -n libwx_baseu-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_baseu-suse-nostl.so.3* +%_libdir/libwx_baseu-%variant.so.%{sonum}* -%files -n libwx_baseu_net-suse-nostl3 +%files -n libwx_baseu_net-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_baseu_net-suse-nostl.so.3* +%_libdir/libwx_baseu_net-%variant.so.%{sonum}* -%files -n libwx_baseu_xml-suse-nostl3 +%files -n libwx_baseu_xml-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_baseu_xml-suse-nostl.so.3* +%_libdir/libwx_baseu_xml-%variant.so.%{sonum}* +%endif -%files -n libwx_gtk2u_adv-suse-nostl3 +%files -n libwx_gtk%{gtk_version}u_adv-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk2u_adv-suse-nostl.so.3* +%_libdir/libwx_gtk%{gtk_version}u_adv-%variant.so.%{sonum}* -%files -n libwx_gtk2u_aui-suse-nostl3 +%files -n libwx_gtk%{gtk_version}u_aui-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk2u_aui-suse-nostl.so.3* +%_libdir/libwx_gtk%{gtk_version}u_aui-%variant.so.%{sonum}* -%files -n libwx_gtk2u_core-suse-nostl3 +%files -n libwx_gtk%{gtk_version}u_core-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk2u_core-suse-nostl.so.3* +%_libdir/libwx_gtk%{gtk_version}u_core-%variant.so.%{sonum}* -%files -n libwx_gtk2u_gl-suse-nostl3 +%files -n libwx_gtk%{gtk_version}u_gl-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk2u_gl-suse-nostl.so.3* +%_libdir/libwx_gtk%{gtk_version}u_gl-%variant.so.%{sonum}* -%files -n libwx_gtk2u_html-suse-nostl3 +%files -n libwx_gtk%{gtk_version}u_html-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk2u_html-suse-nostl.so.3* +%_libdir/libwx_gtk%{gtk_version}u_html-%variant.so.%{sonum}* -%files -n libwx_gtk2u_media-suse-nostl3 +%files -n libwx_gtk%{gtk_version}u_media-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk2u_media-suse-nostl.so.3* +%_libdir/libwx_gtk%{gtk_version}u_media-%variant.so.%{sonum}* -%files -n libwx_gtk2u_propgrid-suse-nostl3 +%files -n libwx_gtk%{gtk_version}u_propgrid-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk2u_propgrid-suse-nostl.so.3* +%_libdir/libwx_gtk%{gtk_version}u_propgrid-%variant.so.%{sonum}* -%files -n libwx_gtk2u_qa-suse-nostl3 +%files -n libwx_gtk%{gtk_version}u_qa-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk2u_qa-suse-nostl.so.3* +%_libdir/libwx_gtk%{gtk_version}u_qa-%variant.so.%{sonum}* -%files -n libwx_gtk2u_ribbon-suse-nostl3 +%files -n libwx_gtk%{gtk_version}u_ribbon-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk2u_ribbon-suse-nostl.so.3* +%_libdir/libwx_gtk%{gtk_version}u_ribbon-%variant.so.%{sonum}* -%files -n libwx_gtk2u_richtext-suse-nostl3 +%files -n libwx_gtk%{gtk_version}u_richtext-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk2u_richtext-suse-nostl.so.3* +%_libdir/libwx_gtk%{gtk_version}u_richtext-%variant.so.%{sonum}* -%files -n libwx_gtk2u_stc-suse-nostl3 +%files -n libwx_gtk%{gtk_version}u_stc-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk2u_stc-suse-nostl.so.3* +%_libdir/libwx_gtk%{gtk_version}u_stc-%variant.so.%{sonum}* -%files -n libwx_gtk2u_xrc-suse-nostl3 +%files -n libwx_gtk%{gtk_version}u_xrc-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk2u_xrc-suse-nostl.so.3* +%_libdir/libwx_gtk%{gtk_version}u_xrc-%variant.so.%{sonum}* %files devel %defattr(-,root,root) ++++++ wxWidgets-3_0.spec ++++++ --- /var/tmp/diff_new_pack.lWCNib/_old 2017-12-31 00:43:13.405413831 +0100 +++ /var/tmp/diff_new_pack.lWCNib/_new 2017-12-31 00:43:13.405413831 +0100 @@ -17,19 +17,20 @@ Name: wxWidgets-3_0 -%define base_name wxWidgets +%define base_name wxWidgets-3_0 %define tarball_name wxWidgets +%define variant suse +%define sonum 3 Version: 3.0.3 Release: 0 %define wx_minor 3.0 # libdir for installing of all the stuff %define wxlibdir %_libdir -# lang packages are exactly equal for all variants. Build it only once: -%if "%name" == "%base_name" +# lang packages are exactly equal for all variants and versions. +# coordinate a bit between nostl and wxWidgets-3_x. %define BUILD_LANG 1 -%else -%define BUILD_LANG 0 -%endif +# build non-UI toolkit related packages +%define base_packages 1 Summary: C++ Library for Cross-Platform Development License: GPL-2.0+ Group: Development/Libraries/C and C++ @@ -45,6 +46,8 @@ Source50: baselibs.conf Patch1: soversion.diff Patch17: relax-abi.diff +Patch18: 0001-spinctrl.patch +Patch19: 0002-spinctrl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #Link SDL2 for newer distros @@ -83,7 +86,8 @@ With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. -%package -n libwx_baseu-suse3 +%if %base_packages +%package -n libwx_baseu-%variant%sonum Summary: wxWidgets Library # Name up to openSUSE 11.3 and up to wxGTK-2.8: Group: System/Libraries @@ -92,109 +96,112 @@ Obsoletes: wxWidgets < %version # wxWidgets-lang requires wxWidgets. Provide them to fix dependencies: Provides: wxWidgets = %version -Recommends: %base_name-lang >= %version +Recommends: wxWidgets-lang >= %version -%description -n libwx_baseu-suse3 +%description -n libwx_baseu-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_baseu_net-suse3 +%package -n libwx_baseu_net-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_baseu_net-suse3 +%description -n libwx_baseu_net-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_baseu_xml-suse3 +%package -n libwx_baseu_xml-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_baseu_xml-suse3 +%description -n libwx_baseu_xml-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_adv-suse3 +%endif + +%package -n libwx_gtk%{gtk_version}u_adv-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_adv-suse3 +%description -n libwx_gtk%{gtk_version}u_adv-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_aui-suse3 +%package -n libwx_gtk%{gtk_version}u_aui-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_aui-suse3 +%description -n libwx_gtk%{gtk_version}u_aui-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_core-suse3 +%package -n libwx_gtk%{gtk_version}u_core-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_core-suse3 +%description -n libwx_gtk%{gtk_version}u_core-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_gl-suse3 +%package -n libwx_gtk%{gtk_version}u_gl-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_gl-suse3 +%description -n libwx_gtk%{gtk_version}u_gl-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_html-suse3 +%package -n libwx_gtk%{gtk_version}u_html-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_html-suse3 +%description -n libwx_gtk%{gtk_version}u_html-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_media-suse3 +%package -n libwx_gtk%{gtk_version}u_media-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_media-suse3 +%description -n libwx_gtk%{gtk_version}u_media-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_propgrid-suse3 +%package -n libwx_gtk%{gtk_version}u_propgrid-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_propgrid-suse3 +%description -n libwx_gtk%{gtk_version}u_propgrid-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_qa-suse3 +%package -n libwx_gtk%{gtk_version}u_qa-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_qa-suse3 +%description -n libwx_gtk%{gtk_version}u_qa-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_ribbon-suse3 +%package -n libwx_gtk%{gtk_version}u_ribbon-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_ribbon-suse3 +%description -n libwx_gtk%{gtk_version}u_ribbon-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_richtext-suse3 +%package -n libwx_gtk%{gtk_version}u_richtext-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_richtext-suse3 +%description -n libwx_gtk%{gtk_version}u_richtext-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_stc-suse3 +%package -n libwx_gtk%{gtk_version}u_stc-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_stc-suse3 +%description -n libwx_gtk%{gtk_version}u_stc-%variant%sonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_xrc-suse3 +%package -n libwx_gtk%{gtk_version}u_xrc-%variant%sonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_xrc-suse3 +%description -n libwx_gtk%{gtk_version}u_xrc-%variant%sonum Library for the wxWidgets cross-platform GUI. +%if %base_packages %package plugin-sound_sdlu-3_0 Summary: wxWidgets SDL Plugin Group: System/Libraries @@ -202,31 +209,32 @@ %description plugin-sound_sdlu-3_0 SDL Plugin for the wxWidgets cross-platform GUI. +%endif + %package devel Summary: Everything needed for development with wxWidgets Group: Development/Libraries/C and C++ Requires: gtk%gtk_version-devel -Requires: libwx_baseu-suse3 = %version -Requires: libwx_baseu_net-suse3 = %version -Requires: libwx_baseu_xml-suse3 = %version -Requires: libwx_gtk%{gtk_version}u_adv-suse3 = %version -Requires: libwx_gtk%{gtk_version}u_aui-suse3 = %version -Requires: libwx_gtk%{gtk_version}u_core-suse3 = %version -Requires: libwx_gtk%{gtk_version}u_gl-suse3 = %version -Requires: libwx_gtk%{gtk_version}u_html-suse3 = %version -Requires: libwx_gtk%{gtk_version}u_media-suse3 = %version -Requires: libwx_gtk%{gtk_version}u_propgrid-suse3 = %version -Requires: libwx_gtk%{gtk_version}u_qa-suse3 = %version -Requires: libwx_gtk%{gtk_version}u_ribbon-suse3 = %version -Requires: libwx_gtk%{gtk_version}u_richtext-suse3 = %version -Requires: libwx_gtk%{gtk_version}u_stc-suse3 = %version -Requires: libwx_gtk%{gtk_version}u_xrc-suse3 = %version +Requires: libwx_baseu-%variant%sonum = %version +Requires: libwx_baseu_net-%variant%sonum = %version +Requires: libwx_baseu_xml-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_adv-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_aui-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_core-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_gl-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_html-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_media-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_propgrid-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_qa-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_ribbon-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_richtext-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_stc-%variant%sonum = %version +Requires: libwx_gtk%{gtk_version}u_xrc-%variant%sonum = %version Requires: pkgconfig(gl) Requires: pkgconfig(glu) Provides: wxGTK2-devel = %version-%release Provides: wxWidgets-devel = %version-%release -Conflicts: otherproviders(wxWidgets-devel) -Conflicts: wxWidgets-experimental-devel +Conflicts: wxWidgets-devel # Name up to openSUSE 11.3 and up to wxGTK-2.8.x: Provides: wxGTK-devel = %version-%release Obsoletes: wxGTK-devel <= %version-%release @@ -241,15 +249,22 @@ Note: wxWidgets variant devel packages are mutually exclusive. Please read %_docdir/%name/README.SUSE to pick a correct variant. -%if %BUILD_LANG -%lang_package -n %base_name -%endif +%package -n wxWidgets-lang +Summary: Translations for wxWidgets +Group: System/Localization +Provides: wxWidgets-lang-all = %version +BuildArch: noarch + +%description -n wxWidgets-lang +Provides translations for wxWidgets. %prep echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %tarball_name-%version %patch -P 1 -p1 %patch -P 17 -p1 +%patch -P 18 -p1 +%patch -P 19 -p1 cp %{S:2} . %build @@ -260,11 +275,11 @@ # --enable-extended_rtti does not compile %if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) -export SDL_CONFIG=/usr/bin/sdl2-config +export SDL_CONFIG=%_bindir/sdl2-config %endif %configure\ - --enable-vendor=suse \ + --enable-vendor=%variant \ --with-gtk=%gtk_version\ --disable-static\ --enable-unicode\ @@ -293,8 +308,13 @@ : %install -export VENDORTAG='-${VENDOR}' # only needed for non-MSW +export VENDORTAG='-$variant' # only needed for non-MSW make install DESTDIR="%buildroot" +%if !0%{?base_packages} +# Drop libraries already supplied by another packages +rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \ + "%buildroot/%_libdir/wx/%wx_minor"/sound_sdlu-*.so +%endif %if %BUILD_LANG # Locales for MS Windows: rm -Rf %buildroot/%_datadir/locale/*/LC_MESSAGES/wxmsw.mo @@ -306,107 +326,112 @@ # HACK: Fix wx-config symlink (bug introduced in 2.9.4). ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config -%post -n libwx_baseu-suse3 -p /sbin/ldconfig -%postun -n libwx_baseu-suse3 -p /sbin/ldconfig -%post -n libwx_baseu_net-suse3 -p /sbin/ldconfig -%postun -n libwx_baseu_net-suse3 -p /sbin/ldconfig -%post -n libwx_baseu_xml-suse3 -p /sbin/ldconfig -%postun -n libwx_baseu_xml-suse3 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_adv-suse3 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_adv-suse3 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_aui-suse3 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_aui-suse3 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_core-suse3 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_core-suse3 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_gl-suse3 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_gl-suse3 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_html-suse3 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_html-suse3 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_media-suse3 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_media-suse3 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_propgrid-suse3 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_propgrid-suse3 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_qa-suse3 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_qa-suse3 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_ribbon-suse3 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_ribbon-suse3 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_richtext-suse3 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_richtext-suse3 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_stc-suse3 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_stc-suse3 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_xrc-suse3 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_xrc-suse3 -p /sbin/ldconfig +%if %base_packages +%post -n libwx_baseu-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig +%post -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig +%post -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig +%endif +%post -n libwx_gtk%{gtk_version}u_adv-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_adv-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_aui-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_aui-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_core-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_core-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_gl-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_gl-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_html-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_html-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_media-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_media-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_propgrid-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_propgrid-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_qa-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_qa-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_ribbon-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_ribbon-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_richtext-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_richtext-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_stc-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_stc-%variant%sonum -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_xrc-%variant%sonum -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_xrc-%variant%sonum -p /sbin/ldconfig %if %BUILD_LANG - -%files lang -f wxstd.lang +%files -n wxWidgets-lang -f wxstd.lang %endif -%files -n libwx_baseu-suse3 +%if %base_packages +%files -n libwx_baseu-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_baseu-suse.so.3* +%_libdir/libwx_baseu-%variant.so.%{sonum}* -%files -n libwx_baseu_net-suse3 +%files -n libwx_baseu_net-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_baseu_net-suse.so.3* +%_libdir/libwx_baseu_net-%variant.so.%{sonum}* -%files -n libwx_baseu_xml-suse3 +%files -n libwx_baseu_xml-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_baseu_xml-suse.so.3* +%_libdir/libwx_baseu_xml-%variant.so.%{sonum}* +%endif -%files -n libwx_gtk%{gtk_version}u_adv-suse3 +%files -n libwx_gtk%{gtk_version}u_adv-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk%{gtk_version}u_adv-suse.so.3* +%_libdir/libwx_gtk%{gtk_version}u_adv-%variant.so.%{sonum}* -%files -n libwx_gtk%{gtk_version}u_aui-suse3 +%files -n libwx_gtk%{gtk_version}u_aui-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk%{gtk_version}u_aui-suse.so.3* +%_libdir/libwx_gtk%{gtk_version}u_aui-%variant.so.%{sonum}* -%files -n libwx_gtk%{gtk_version}u_core-suse3 +%files -n libwx_gtk%{gtk_version}u_core-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk%{gtk_version}u_core-suse.so.3* +%_libdir/libwx_gtk%{gtk_version}u_core-%variant.so.%{sonum}* -%files -n libwx_gtk%{gtk_version}u_gl-suse3 +%files -n libwx_gtk%{gtk_version}u_gl-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk%{gtk_version}u_gl-suse.so.3* +%_libdir/libwx_gtk%{gtk_version}u_gl-%variant.so.%{sonum}* -%files -n libwx_gtk%{gtk_version}u_html-suse3 +%files -n libwx_gtk%{gtk_version}u_html-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk%{gtk_version}u_html-suse.so.3* +%_libdir/libwx_gtk%{gtk_version}u_html-%variant.so.%{sonum}* -%files -n libwx_gtk%{gtk_version}u_media-suse3 +%files -n libwx_gtk%{gtk_version}u_media-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk%{gtk_version}u_media-suse.so.3* +%_libdir/libwx_gtk%{gtk_version}u_media-%variant.so.%{sonum}* -%files -n libwx_gtk%{gtk_version}u_propgrid-suse3 +%files -n libwx_gtk%{gtk_version}u_propgrid-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk%{gtk_version}u_propgrid-suse.so.3* +%_libdir/libwx_gtk%{gtk_version}u_propgrid-%variant.so.%{sonum}* -%files -n libwx_gtk%{gtk_version}u_qa-suse3 +%files -n libwx_gtk%{gtk_version}u_qa-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk%{gtk_version}u_qa-suse.so.3* +%_libdir/libwx_gtk%{gtk_version}u_qa-%variant.so.%{sonum}* -%files -n libwx_gtk%{gtk_version}u_ribbon-suse3 +%files -n libwx_gtk%{gtk_version}u_ribbon-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk%{gtk_version}u_ribbon-suse.so.3* +%_libdir/libwx_gtk%{gtk_version}u_ribbon-%variant.so.%{sonum}* -%files -n libwx_gtk%{gtk_version}u_richtext-suse3 +%files -n libwx_gtk%{gtk_version}u_richtext-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk%{gtk_version}u_richtext-suse.so.3* +%_libdir/libwx_gtk%{gtk_version}u_richtext-%variant.so.%{sonum}* -%files -n libwx_gtk%{gtk_version}u_stc-suse3 +%files -n libwx_gtk%{gtk_version}u_stc-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk%{gtk_version}u_stc-suse.so.3* +%_libdir/libwx_gtk%{gtk_version}u_stc-%variant.so.%{sonum}* -%files -n libwx_gtk%{gtk_version}u_xrc-suse3 +%files -n libwx_gtk%{gtk_version}u_xrc-%variant%sonum %defattr(-,root,root) -%_libdir/libwx_gtk%{gtk_version}u_xrc-suse.so.3* +%_libdir/libwx_gtk%{gtk_version}u_xrc-%variant.so.%{sonum}* +%if %base_packages %files plugin-sound_sdlu-3_0 %defattr(-,root,root) %dir %_libdir/wx %dir %_libdir/wx/%wx_minor %_libdir/wx/%wx_minor/sound_sdlu-%wx_minor.so +%endif %files devel %defattr(-,root,root) ++++++ 0001-spinctrl.patch ++++++ commit c1cd1e01b51fc424cc200e718787ae1bb648094e Author: Vadim Zeitlin <vadim(a)wxwidgets.org> Date: Sun Apr 3 17:11:09 2016 +0200 Fix wxSpinCtrl best size calculation for GTK+ 3 Don't hard code the width of spin buttons in wxGTK, this more or less worked for GTK+ 2 (at least with the default theme, it was perfectly possible that it also didn't work with some other ones), but not at all with GTK+ 3 where the buttons are much wider than the hardcoded value. Instead, do the same thing as wxSpinButton wxGTK implementation already does and force the GTK+ widget to compute its preferred size as we need it, i.e. without taking the text width into account, by forcing the width of the text entry to 0. Notice that for GTK+ 3.12+ we also need to set the max width to 0 as well to prevent the entry from making itself big enough for that many characters, see #17051. diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index 61c533a..c7067fd 100644 --- a/src/gtk/spinctrl.cpp +++ b/src/gtk/spinctrl.cpp @@ -362,24 +362,24 @@ wxSize wxSpinCtrlGTKBase::DoGetSizeFromTextSize(int xlen, int ylen) const { wxASSERT_MSG( m_widget, wxS("GetSizeFromTextSize called before creation") ); - // Set an as small as possible size for the control, so preferred sizes - // return "natural" sizes, not taking into account the previous ones (which - // seems to be GTK+3 behaviour) - gtk_widget_set_size_request(m_widget, 0, 0); - - // Both Gtk+2 and Gtk+3 use current value/range to measure control's width. - // So, we can't ask Gtk+ for its width. Instead, we used hardcoded values. + const gint widthChars = gtk_entry_get_width_chars(GTK_ENTRY(m_widget)); + gtk_entry_set_width_chars(GTK_ENTRY(m_widget), 0); +#if GTK_CHECK_VERSION(3,12,0) + gint maxWidthChars = 0; + if ( gtk_check_version(3,12,0) == NULL ) + { + maxWidthChars = gtk_entry_get_max_width_chars(GTK_ENTRY(m_widget)); + gtk_entry_set_max_width_chars(GTK_ENTRY(m_widget), 0); + } +#endif // GTK+ 3.12+ - // Returned height is OK wxSize totalS = GTKGetPreferredSize(m_widget); -#if GTK_CHECK_VERSION(3,4,0) - // two buttons in horizontal - totalS.x = 46 + 15; // margins included -#else - // two small buttons in vertical - totalS.x = GetFont().GetPixelSize().y + 13; // margins included -#endif +#if GTK_CHECK_VERSION(3,12,0) + if ( gtk_check_version(3,12,0) == NULL ) + gtk_entry_set_max_width_chars(GTK_ENTRY(m_widget), maxWidthChars); +#endif // GTK+ 3.12+ + gtk_entry_set_width_chars(GTK_ENTRY(m_widget), widthChars); wxSize tsize(xlen + totalS.x, totalS.y); ++++++ 0002-spinctrl.patch ++++++ commit 7465237353f795bb9872aca688e9c19000a7a16d Author: Vadim Zeitlin <vadim(a)wxwidgets.org> Date: Sun Apr 3 18:02:43 2016 +0200 Improve wxSpinCtrl best size computation in wxGTK Don't hardcode completely arbitrary width of 95px for the text part, but compute it from the values this control is actually used for. diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index c7067fd..b33593c 100644 --- a/src/gtk/spinctrl.cpp +++ b/src/gtk/spinctrl.cpp @@ -355,7 +355,16 @@ GdkWindow *wxSpinCtrlGTKBase::GTKGetWindow(wxArrayGdkWindows& windows) const wxSize wxSpinCtrlGTKBase::DoGetBestSize() const { - return DoGetSizeFromTextSize(95); // TODO: 95 is completely arbitrary + const int minVal = static_cast<int>(DoGetMin()); + const int lenMin = wxString::Format("%d", minVal).length(); + + const int maxVal = static_cast<int>(DoGetMax()); + const int lenMax = wxString::Format("%d", maxVal).length(); + + wxString longestText(wxMax(lenMin, lenMax), '9'); + if ( minVal < 0 ) + longestText.insert(0, "-"); + return DoGetSizeFromTextSize(GetTextExtent(longestText).x, -1); } wxSize wxSpinCtrlGTKBase::DoGetSizeFromTextSize(int xlen, int ylen) const

1 0

commit libostree for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '17

30 Dec '17

Hello community, here is the log from the commit of package libostree for openSUSE:Factory checked in at 2017-12-31 00:42:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libostree (Old) and /work/SRC/openSUSE:Factory/.libostree.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libostree" Sun Dec 31 00:42:56 2017 rev:6 rq:559495 version:2017.15 Changes: -------- --- /work/SRC/openSUSE:Factory/libostree/libostree.changes 2017-11-12 17:57:21.191731253 +0100 +++ /work/SRC/openSUSE:Factory/.libostree.new/libostree.changes 2017-12-31 00:43:02.617012249 +0100 @@ -2 +2,72 @@ -Mon Oct 09 13:02:48 UTC 2017 - opensuse-packaging(a)opensuse.org +Wed Dec 20 10:37:56 UTC 2017 - zaitor(a)opensuse.org + +- Update to version 2017.15: + + The headlining feature in this release is support for + repository locking, contributed by Dan Nicholson. Currently it + is disabled by default; add locking=true in a repository + configuration file to enable. This feature should be considered + as "tech preview"; it's highly likely we'll stabilize it in its + current form, but it's possible something will change. + Currently the locking only protects commit + prune; there is a + large pending PR to extend locking to many more APIs and + commands. + + Several new APIs were added; for example libostree now has a + convenient API to break a hardlink, which happens in e.g. + rpm-ostree in several places such as handling the RPM database. + + Also, multithreading support in the commit APIs was cleaned up + and clarified. It's now possible to call transaction_set_ref() + from multiple threads, which rpm-ostree uses now to import RPMs + to OSTree in parallel. + + We're tracking an issue with http2+libcurl and it looks like + there are a number of issues still floating around + HTTP2+libcurl (some are server bugs), that we added support at + both build and runtime to disable http2. + + The fsck command learned how to verify ref bindings, and + relatedly, the commit command gained a --unbound option to skip + creating ref bindings. + +------------------------------------------------------------------- +Wed Dec 20 10:36:05 UTC 2017 - zaitor(a)opensuse.org + +- Update to version 2017.14: + + This release is almost entirely bugfixes. One notable fix is a + read-after-free when libcurl is finalizing that some people + have hit. + + There are a number of improvements around the ${repo}/tmp + directory and the per-transaction staging directory in + preparation for adding locking in a future release. This + release should already help avoid several failures when doing + concurrent commits; the aim of the locking work will support + concurrent prunes and commits. + +------------------------------------------------------------------- +Wed Dec 20 10:35:29 UTC 2017 - zaitor(a)opensuse.org + +- Update to version 2017.13: + + A lot of across-the-board improvements here; the pure bugfixes + are mostly in the experimental Avahi bits, hardening the + FIFREEZE on /boot code, explicit errors when trying to commit + non-UTF8 filenames, and finally a number of fixes around our + use of mmap. + + One slight backwards-incompatible change (but I doubt it'll + break anyone): Disallow refs starting with a non-letter or + digit If this does affect you, please let us know ASAP. + + For improvements, first up, Alex changed the static delta code + to avoid holding everything in memory; this is a substantial + improvement for large deltas, and also for flatpak which uses + deltas as a "bundle" format. + + A few notable changes: + - commit: Add _CONSUME modifier flag. You probably want to use + this by default for your build/package systems. + - core: Add standard SOURCE_TITLE metadata key. This one I + think is conceptually quite interesting; for many people, + their ostree commits are derived from something else that has + its own versioning, and it's useful to show that explicitly. + I encourage ostree-based build systems to consider rendering + human-readable information about your builds into this + standardized metadata key. + - On the command line side: cleaning up the --help output + significantly. + +------------------------------------------------------------------- +Mon Oct 09 13:02:48 UTC 2017 - aplazas(a)suse.com Old: ---- libostree-2017.12.tar.xz New: ---- libostree-2017.15.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libostree.spec ++++++ --- /var/tmp/diff_new_pack.VOoUcO/_old 2017-12-31 00:43:03.176825526 +0100 +++ /var/tmp/diff_new_pack.VOoUcO/_new 2017-12-31 00:43:03.176825526 +0100 @@ -17,7 +17,7 @@ Name: libostree -Version: 2017.12 +Version: 2017.15 Release: 0 Summary: Git for operating system binaries License: LGPL-2.0+ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.VOoUcO/_old 2017-12-31 00:43:03.208814856 +0100 +++ /var/tmp/diff_new_pack.VOoUcO/_new 2017-12-31 00:43:03.212813522 +0100 @@ -2,10 +2,10 @@ <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/ostreedev/ostree.git</param> <param name="scm">git</param> - <param name="versionformat">2017.12</param> + <param name="versionformat">2017.15</param> <param name="filename">libostree</param> <param name="changesgenerate">enable</param> - <param name="revision">refs/tags/v2017.12</param> + <param name="revision">refs/tags/v2017.15</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.VOoUcO/_old 2017-12-31 00:43:03.232806853 +0100 +++ /var/tmp/diff_new_pack.VOoUcO/_new 2017-12-31 00:43:03.236805520 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ostreedev/ostree.git</param> - <param name="changesrevision">64f3257d8832edf6855052b5c8a3fc5250279499</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">19d08dab617bf060c6440ecbd8df3347b04741b5</param></service></servicedata> \ No newline at end of file ++++++ libostree-2017.12.tar.xz -> libostree-2017.15.tar.xz ++++++ ++++ 18754 lines of diff (skipped)

1 0

commit parted for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '17

30 Dec '17

Hello community, here is the log from the commit of package parted for openSUSE:Factory checked in at 2017-12-31 00:42:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/parted (Old) and /work/SRC/openSUSE:Factory/.parted.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "parted" Sun Dec 31 00:42:51 2017 rev:122 rq:559490 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/parted/parted.changes 2017-12-21 11:22:05.256777111 +0100 +++ /work/SRC/openSUSE:Factory/.parted.new/parted.changes 2017-12-31 00:42:53.831942466 +0100 @@ -1,0 +2,5 @@ +Fri Dec 22 17:23:25 CET 2017 - sparschauer(a)suse.de + +- Amend patch headers (no functional change) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dummy-bootcode-only-for-x86.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:55.711315611 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:55.711315611 +0100 @@ -1,3 +1,6 @@ +From: Petr Uzel <petr.uzel(a)suse.cz> +Subject: parted: dos: Wipe boot code only on x86 +Patch-mainline: no, custom SUSE patch --- libparted/labels/dos.c | 7 +++++++ 1 file changed, 7 insertions(+) ++++++ lib-fs-resize-prevent-crash-resizing-FAT16.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:55.727310276 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:55.735307608 +0100 @@ -1,7 +1,8 @@ -From 1e9e770f4bc7f3d80e09ecd1df58575fad064163 Mon Sep 17 00:00:00 2001 From: Mike Fleetwood <mike.fleetwood(a)googlemail.com> Date: Sun, 28 Sep 2014 16:15:48 +0100 -Subject: [PATCH] lib-fs-resize: Prevent crash resizing FAT16 file systems +Subject: lib-fs-resize: Prevent crash resizing FAT16 file systems +Patch-mainline: v3.3 +Git-commit: 1e9e770f4bc7f3d80e09ecd1df58575fad064163 Resizing FAT16 file system crashes in libparted/fs/r/fat/resize.c create_resize_context() because it was dereferencing NULL pointer ++++++ libparted-Add-support-for-NVDIMM-devices.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:55.743304941 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:55.747303607 +0100 @@ -2,7 +2,8 @@ Date: Mon, 23 Oct 2017 17:47:47 +0200 Subject: Add support for NVDIMM devices References: bsc#1064446 -Patch-mainline: submitted, 2017-10-24 10:22 +0200 +Patch-mainline: v3.3 +Git-commit: 71885c5f493f3a5d950adbb3e8d17eff7e023053 Recognize NVDIMM devices, so that "parted -s /dev/pmem7 p" now prints "Model: NVDIMM Device (pmem)" instead of ++++++ libparted-Add-support-for-NVMe-devices.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:55.767296938 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:55.767296938 +0100 @@ -1,7 +1,9 @@ -From 02bb5fe15b89b0a0ffd4019c9d04f16c0af29d46 Mon Sep 17 00:00:00 2001 From: Petr Uzel <petr.uzel(a)suse.cz> Date: Tue, 14 Jun 2016 10:41:18 +0200 -Subject: [PATCH] Add support for NVMe devices +Subject: Add support for NVMe devices +References: bsc#982169 +Patch-mainline: v3.3 +Git-commit: e4ae4330f3e33201aeeed3b7ca88e15d98d03e13 Recognize NVMe Devices, so "parted -s /dev/nvme0n1" now prints "NVMe Device (nvme)" instead of "Model: Unknown (unknown)". ++++++ libparted-Use-read-only-when-probing-devices-on-linu.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:55.791288936 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:55.791288936 +0100 @@ -1,8 +1,8 @@ -From 44d5ae0115c4ecfe3158748309e9912c5aede92d Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" <bcl(a)redhat.com> Date: Thu, 6 Aug 2015 07:17:14 -0700 -Subject: [PATCH] libparted: Use read only when probing devices on linux - (#1245144) +Subject: libparted: Use read only when probing devices on linux +Patch-mainline: v3.3 +Git-commit: 44d5ae0115c4ecfe3158748309e9912c5aede92d When a device is opened for RW closing it can trigger other actions, like udev scanning it for partition changes. Use read only for the ++++++ libparted-allow-bigger-snap-radius-if-cylinders-are-used.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:55.807283601 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:55.815280934 +0100 @@ -1,7 +1,8 @@ -From 2ef86fbe0fd8a6c4b48dd8edfbe41728a7343dac Mon Sep 17 00:00:00 2001 From: Petr Uzel <petr.uzel(a)suse.cz> Date: Thu, 29 May 2014 14:50:31 +0200 -Subject: [PATCH] libparted: allow bigger snap radius if cylinders are used +Subject: libparted: allow bigger snap radius if cylinders are used +References: bnc#879387 +Patch-mainline: no, custom change for flexibility This is partial revert of commit @@ -19,8 +20,6 @@ Only revert to the old behavior if cylinders are used in order to give parted more flexibility when snapping the partition start/end. - -References: bnc#879387 --- libparted/unit.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ++++++ libparted-avoid-libdevice-mapper-warnings.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:55.823278266 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:55.823278266 +0100 @@ -1,3 +1,6 @@ +From: Petr Uzel <petr.uzel(a)suse.cz> +Subject: libparted: Avoid libdevice-mapper warnings +Patch-mainline: no, custom SUSE patch --- libparted/arch/linux.c | 6 ++++++ 1 file changed, 6 insertions(+) ++++++ libparted-dasd-do-not-use-first-tracks.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:55.859266262 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:55.863264929 +0100 @@ -1,3 +1,6 @@ +From: Petr Uzel <petr.uzel(a)suse.cz> +Subject: libparted: dasd: Do not use first tracks +Patch-mainline: v3.3, solved a bit differently in 4126d0292c75 --- libparted/labels/dasd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ++++++ libparted-dasd-implicit-partition-disk-flag.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:55.887256926 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:55.887256926 +0100 @@ -1,3 +1,6 @@ +From: Petr Uzel <petr.uzel(a)suse.cz> +Subject: libparted: dasd: Add an implicit partition disk flag +Patch-mainline: no, custom SUSE patch --- include/parted/disk.in.h | 4 +++- libparted/disk.c | 2 ++ ++++++ libparted-fix-nvme-partition-naming.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:55.935240921 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:55.939239588 +0100 @@ -1,3 +1,7 @@ +From: Petr Uzel <petr.uzel(a)suse.cz> +Subject: libparted: Fix NVMe device naming +References: bsc#982169 +Patch-mainline: no, required to fix custom SUSE device naming --- libparted/arch/linux.c | 1 + 1 file changed, 1 insertion(+) ++++++ libparted-make-BLKRRPART-more-robust.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:55.959232919 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:55.959232919 +0100 @@ -1,3 +1,6 @@ +From: Petr Uzel <petr.uzel(a)suse.cz> +Subject: libparted: Make BLKRRPART more robust +Patch-mainline: no, upstream does not use BLKRRPART and leaves DASDs broken --- libparted/arch/linux.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ++++++ libparted-make-sure-not-to-treat-percentages-and-cyls-as-exact.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:55.975227584 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:55.975227584 +0100 @@ -1,7 +1,8 @@ -From 01900e056ec250836d15b5f5c3f59a8e1454b781 Mon Sep 17 00:00:00 2001 From: Phillip Susi <psusi(a)ubuntu.com> Date: Mon, 4 Nov 2013 13:10:09 -0500 -Subject: [PATCH] libparted: make sure not to treat percentages as exact +Subject: libparted: make sure not to treat percentages as exact +Patch-mainline: v3.2, custom part from puzel still required +Git-commit: 01900e056ec250836d15b5f5c3f59a8e1454b781 If 1% of the drive size worked out ot be an even power of two, it would trigger the exact placement. Add an exception @@ -9,7 +10,6 @@ Petr Uzel <puzel(a)suse.cz>: Also avoid this logic when the unit is specified as cylinders. - --- libparted/unit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ++++++ libparted-use-BLKRRPART-for-DASD.patch.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:56.015214246 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:56.015214246 +0100 @@ -1,9 +1,8 @@ -From ac422c32ae3be0e599f7b3f4ab6961b61129c4ba Mon Sep 17 00:00:00 2001 From: Petr Uzel <petr.uzel(a)suse.cz> Date: Fri, 14 Feb 2014 09:12:47 +0100 -Subject: [PATCH] libparted-used-BLKRRPART-for-DASD.patch - -Addresses: bnc#862139 +Subject: libparted: use BLKRRPART for DASDs +References: bnc#862139 +Patch-mainline: no, upstream dropped proper DASD support This reverts upstream commit 9fa0e1800db5b9f094ae481fd95a51da03f19e95. This reverts upstream commit 1223b9fc07859cb619c80dc057bd05458f9b5669. ++++++ more-reliable-informing-the-kernel.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:56.027210245 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:56.031208912 +0100 @@ -1,12 +1,15 @@ -# bnc#657360 -# -# This patch should make parted's process of informing the kernel -# about changes of partition table sligtly more reliable. -# It consists of 3 quite unrelated parts: -# -# 1. increase the max sleep time if partition is busy from 1 to 2 seconds -# 2. do not inform the kernel when only partition flags change - kernel -# does not care about the flags +From: Petr Uzel <petr.uzel(a)suse.cz> +Subject: parted: Make informing the kernel more reliable +References: bnc#657360 +Patch-mainline: no + +This patch should make parted's process of informing the kernel +about changes of partition table sligtly more reliable. +It consists of 2 quite unrelated parts: + +* increase the max sleep time if partition is busy from 1 to 2 seconds +* do not inform the kernel when only partition flags change - kernel + does not care about the flags --- libparted/arch/linux.c | 2 +- parted/parted.c | 28 +++++++++++++++++++++++++++- ++++++ parted-2.4-ncursesw6.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:56.059199576 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:56.063198242 +0100 @@ -1,3 +1,6 @@ +From: Petr Uzel <petr.uzel(a)suse.cz> +Subject: build: Add ncursesw6 support +Patch-mainline: no, custom SUSE patch --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ++++++ parted-fatresize-autoconf.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:56.119179569 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:56.123178236 +0100 @@ -1,3 +1,17 @@ +From: Petr Uzel <petr.uzel(a)suse.cz> +Subject: build: Patch fatresize build into parted package +Patch-mainline: no, custom SUSE patch + +Fatresize is used by YaST to resize FAT16/FAT32 file systems. It uses +libparted functions for that purpose but does not resize the FAT +partition afterward. That is the task of parted instead. So using it +without parted and YaST doesn't make much sense. + +Versions more recent than 0.1 like e.g. 1.0.3 are incompatible and +risk data loss by silently increasing the FS size (See: bsc#1072479). + +Upstream: https://github.com/ya-mouse/fatresize +[sparschauer: Wrote the patch description] --- Makefile.am | 2 +- configure.ac | 1 + ++++++ parted-mac.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:56.151168900 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:56.159166232 +0100 @@ -1,3 +1,6 @@ +From: Petr Uzel <petr.uzel(a)suse.cz> +Subject: parted: mac: Print the system name +Patch-mainline: no, custom SUSE patch --- include/parted/disk.in.h | 9 +++++++-- libparted/disk.c | 33 +++++++++++++++++++++++++++++++++ ++++++ parted-resize-alias-to-resizepart.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:56.199152895 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:56.199152895 +0100 @@ -1,3 +1,6 @@ +From: Petr Uzel <petr.uzel(a)suse.cz> +Subject: parted: Add an "resize" alias for "resizepart" +Patch-mainline: no, compatibility for parted < 3.0 syntax --- parted/parted.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ++++++ parted-type.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:56.219146226 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:56.219146226 +0100 @@ -1,3 +1,9 @@ +From: Petr Uzel <petr.uzel(a)suse.cz> +Subject: parted: Introduce a type flag +Patch-mainline: no, required by YaST + +YaST requires a type flag in order to check the current partition +type for msdos partition tables. --- include/parted/disk.in.h | 5 ++- libparted/disk.c | 2 + ++++++ parted-wipeaix.patch ++++++ --- /var/tmp/diff_new_pack.A7cphW/_old 2017-12-31 00:42:56.255134222 +0100 +++ /var/tmp/diff_new_pack.A7cphW/_new 2017-12-31 00:42:56.255134222 +0100 @@ -1,3 +1,6 @@ +From: Petr Uzel <petr.uzel(a)suse.cz> +Subject: parted: dos: Wipe AIX FS signatures +Patch-mainline: no, custom SUSE patch --- libparted/labels/dos.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

1 0