December 2018 - openSUSE Commits - openSUSE Mailing Lists

commit 000product for openSUSE:Factory
by root 28 Dec '18

28 Dec '18

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2018-12-28 12:36:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Fri Dec 28 12:36:18 2018 rev:771 rq: version:unknown Fri Dec 28 12:36:17 2018 rev:770 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ _service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi: same change _service:product_converter:openSUSE-Addon-NonOss-release.spec: same change ++++++ _service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.X7tqtz/_old 2018-12-28 12:36:40.911906342 +0100 +++ /var/tmp/diff_new_pack.X7tqtz/_new 2018-12-28 12:36:40.911906342 +0100 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-Tumbleweed-Kubic___20181227" schemaversion="4.1"> +<image name="OBS__openSUSE-Tumbleweed-Kubic___20181228" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,9 +35,9 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20181227</productvar> + <productvar name="VERSION">20181228</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-tumbleweed-kubic:20181227,openSUSE Tumbleweed Kubic</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-tumbleweed-kubic:20181228,openSUSE Tumbleweed Kubic</productinfo> <productinfo name="LINGUAS">en_US </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ _service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec ++++++ --- /var/tmp/diff_new_pack.X7tqtz/_old 2018-12-28 12:36:40.927906331 +0100 +++ /var/tmp/diff_new_pack.X7tqtz/_new 2018-12-28 12:36:40.927906331 +0100 @@ -17,7 +17,7 @@ Name: openSUSE-Tumbleweed-Kubic-release -Version: 20181227 +Version: 20181228 Release: 0 Summary: openSUSE Tumbleweed Kubic License: GPL-2.0-or-later @@ -38,9 +38,9 @@ ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 Provides: %name-%version Provides: product() = openSUSE-Tumbleweed-Kubic -Provides: product(openSUSE-Tumbleweed-Kubic) = 20181227-0 +Provides: product(openSUSE-Tumbleweed-Kubic) = 20181228-0 Provides: product-label() = openSUSE%20Tumbleweed%20Kubic -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20181227 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20181228 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(openSUSE-Tumbleweed-Kubic) @@ -61,7 +61,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE-Tumbleweed-Kubic) = 20181227-0 +Provides: product_flavor(openSUSE-Tumbleweed-Kubic) = 20181228-0 Summary: openSUSE Tumbleweed Kubic %description dvd @@ -123,11 +123,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Tumbleweed-Kubic</name> - <version>20181227</version> + <version>20181228</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-tumbleweed-kubic:20181227</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-tumbleweed-kubic:20181228</cpeid> <productline>openSUSE-Tumbleweed-Kubic</productline> <register> <pool> ++++++ _service:product_converter:openSUSE-cd-mini-i586.kiwi ++++++ --- /var/tmp/diff_new_pack.X7tqtz/_old 2018-12-28 12:36:40.943906319 +0100 +++ /var/tmp/diff_new_pack.X7tqtz/_new 2018-12-28 12:36:40.943906319 +0100 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20181227" schemaversion="4.1"> +<image name="OBS__openSUSE___20181228" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -32,9 +32,9 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20181227</productvar> + <productvar name="VERSION">20181228</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20181227,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20181228,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> _service:product_converter:openSUSE-cd-mini-x86_64.kiwi: same change _service:product_converter:openSUSE-dvd5-dvd-i586.kiwi: same change _service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi: same change ++++++ _service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.X7tqtz/_old 2018-12-28 12:36:40.999906280 +0100 +++ /var/tmp/diff_new_pack.X7tqtz/_new 2018-12-28 12:36:40.999906280 +0100 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20181227" schemaversion="4.1"> +<image name="OBS__openSUSE___20181228" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -24,7 +24,7 @@ <productvar name="DISTNAME">openSUSE</productvar> <productvar name="FLAVOR">ftp</productvar> <productvar name="MAKE_LISTINGS">true</productvar> - <productvar name="MEDIUM_NAME">openSUSE-20181227-i586-x86_64</productvar> + <productvar name="MEDIUM_NAME">openSUSE-20181228-i586-x86_64</productvar> <productvar name="MULTIPLE_MEDIA">true</productvar> <productvar name="PRODUCT_DIR">/</productvar> <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar> @@ -36,9 +36,9 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20181227</productvar> + <productvar name="VERSION">20181228</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20181227,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20181228,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="DEBUGMEDIUM">2</productoption> ++++++ _service:product_converter:openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.X7tqtz/_old 2018-12-28 12:36:41.027906261 +0100 +++ /var/tmp/diff_new_pack.X7tqtz/_new 2018-12-28 12:36:41.043906249 +0100 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20181227 +Version: 20181228 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -53,7 +53,7 @@ Obsoletes: aaa_version Obsoletes: openSUSE-Promo-release <= 11.1 Obsoletes: openSUSE-release-live <= 11.0 -Obsoletes: product_flavor(%{product}) < 20181227 +Obsoletes: product_flavor(%{product}) < 20181228 # bnc#826592 Provides: weakremover(kernel-default) < 3.11 Provides: weakremover(kernel-desktop) < 4.2 @@ -63,7 +63,7 @@ Provides: weakremover(kernel-xen) < 3.11 Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20181227-0 +Provides: product(openSUSE) = 20181228-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -77,7 +77,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20181227 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20181228 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) @@ -17814,7 +17814,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20181227-0 +Provides: product_flavor(openSUSE) = 20181228-0 Summary: openSUSE Tumbleweed %description ftp @@ -17829,7 +17829,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20181227-0 +Provides: product_flavor(openSUSE) = 20181228-0 Summary: openSUSE Tumbleweed %description mini @@ -17844,7 +17844,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20181227-0 +Provides: product_flavor(openSUSE) = 20181228-0 Summary: openSUSE Tumbleweed %description dvd @@ -17859,7 +17859,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20181227-0 +Provides: product_flavor(openSUSE) = 20181228-0 Summary: openSUSE Tumbleweed %description livecd-kde @@ -17874,7 +17874,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20181227-0 +Provides: product_flavor(openSUSE) = 20181228-0 Summary: openSUSE Tumbleweed %description livecd-x11 @@ -17889,7 +17889,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20181227-0 +Provides: product_flavor(openSUSE) = 20181228-0 Summary: openSUSE Tumbleweed %description livecd-gnome @@ -17904,7 +17904,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20181227-0 +Provides: product_flavor(openSUSE) = 20181228-0 Summary: openSUSE Tumbleweed %description usb-kde @@ -17919,7 +17919,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20181227-0 +Provides: product_flavor(openSUSE) = 20181228-0 Summary: openSUSE Tumbleweed %description usb-gnome @@ -17934,7 +17934,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20181227-0 +Provides: product_flavor(openSUSE) = 20181228-0 Summary: openSUSE Tumbleweed %description usb-x11 @@ -18007,10 +18007,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20181227</version> + <version>20181228</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20181227</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20181228</cpeid> <productline>openSUSE</productline> <register> <pool> openSUSE-release.spec: same change ++++++ openSUSE-Tumbleweed-Kubic.product ++++++ --- /var/tmp/diff_new_pack.X7tqtz/_old 2018-12-28 12:36:41.271906089 +0100 +++ /var/tmp/diff_new_pack.X7tqtz/_new 2018-12-28 12:36:41.275906087 +0100 @@ -6,7 +6,7 @@ <name>openSUSE-Tumbleweed-Kubic</name> <releasepkgname>openSUSE-Tumbleweed-Kubic-release</releasepkgname> <endoflife/> - <version>20181227</version> + <version>20181228</version>  <release>0</release> <productline>openSUSE-Tumbleweed-Kubic</productline> ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.X7tqtz/_old 2018-12-28 12:36:41.287906078 +0100 +++ /var/tmp/diff_new_pack.X7tqtz/_new 2018-12-28 12:36:41.291906075 +0100 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20181227</version> + <version>20181228</version> <release>0</release> <productline>openSUSE</productline>

1 0

commit opera for openSUSE:Factory:NonFree
by root 28 Dec '18

28 Dec '18

Hello community, here is the log from the commit of package opera for openSUSE:Factory:NonFree checked in at 2018-12-28 12:36:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/opera (Old) and /work/SRC/openSUSE:Factory:NonFree/.opera.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opera" Fri Dec 28 12:36:14 2018 rev:65 rq:661260 version:57.0.3098.106 Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/opera/opera.changes 2018-12-18 15:01:33.445965758 +0100 +++ /work/SRC/openSUSE:Factory:NonFree/.opera.new.28833/opera.changes 2018-12-28 12:36:29.211914549 +0100 @@ -1,0 +2,11 @@ +Mon Dec 24 16:06:35 UTC 2018 - sean(a)suspend.net + +- Update to version 57.0.3098.106 + * DNA-70670 Internal error pages miss error code info + * DNA-73057 Crash fixes + * DNA-74364 Zen news notification doesn't disappear + * DNA-74531 Use Discover servers by default + * DNA-74542 Record the feature value for DNA-74540 + * DNA-74503 [SECURITY] Magellan vuln fix + +------------------------------------------------------------------- Old: ---- opera-stable_57.0.3098.102_amd64.rpm New: ---- opera-stable_57.0.3098.106_amd64.rpm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opera.spec ++++++ --- /var/tmp/diff_new_pack.uR2FJH/_old 2018-12-28 12:36:30.843913404 +0100 +++ /var/tmp/diff_new_pack.uR2FJH/_new 2018-12-28 12:36:30.847913401 +0100 @@ -20,7 +20,7 @@ # libffmpeg.so*, libfreetype.so* and libGLESv2.so* are currently bundled. %global __requires_exclude ^lib(ffmpeg|freetype|GLESv2)\\.so.*$ Name: opera -Version: 57.0.3098.102 +Version: 57.0.3098.106 Release: 0 Summary: Proprietary web browser License: NonFree ++++++ opera-stable_57.0.3098.102_amd64.rpm -> opera-stable_57.0.3098.106_amd64.rpm ++++++ /work/SRC/openSUSE:Factory:NonFree/opera/opera-stable_57.0.3098.102_amd64.rpm /work/SRC/openSUSE:Factory:NonFree/.opera.new.28833/opera-stable_57.0.3098.106_amd64.rpm differ: char 36, line 1

1 0

commit gnome-multi-writer for openSUSE:Factory
by root 28 Dec '18

28 Dec '18

Hello community, here is the log from the commit of package gnome-multi-writer for openSUSE:Factory checked in at 2018-12-28 12:36:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-multi-writer (Old) and /work/SRC/openSUSE:Factory/.gnome-multi-writer.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-multi-writer" Fri Dec 28 12:36:12 2018 rev:15 rq:661754 version:3.30.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-multi-writer/gnome-multi-writer.changes 2018-09-17 14:28:26.735679190 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-multi-writer.new.28833/gnome-multi-writer.changes 2018-12-28 12:36:13.639925465 +0100 @@ -1,0 +2,9 @@ +Fri Dec 28 00:40:30 UTC 2018 - bjorn.lie(a)gmail.com + +- Add upstream bug fix patches from stable branch: + + gnome-multi-writer-Various-C99-cleanups.patch: Various C99 + cleanups. + + gnome-multi-writer-Use-G_DECLARE_FINAL_TYPE.patch: Use + G_DECLARE_FINAL_TYPE for GmwDevice. + +------------------------------------------------------------------- New: ---- gnome-multi-writer-Use-G_DECLARE_FINAL_TYPE.patch gnome-multi-writer-Various-C99-cleanups.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-multi-writer.spec ++++++ --- /var/tmp/diff_new_pack.AxOfcd/_old 2018-12-28 12:36:14.203925069 +0100 +++ /var/tmp/diff_new_pack.AxOfcd/_new 2018-12-28 12:36:14.207925066 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,6 +24,9 @@ Group: System/GUI/GNOME URL: https://wiki.gnome.org/Apps/MultiWriter Source0: https://download.gnome.org/sources/gnome-multi-writer/3.30/%{name}-%{versio… +# PATCH-FIX-UPSTREAM gnome-multi-writer-Various-C99-cleanups.patch -- Various C99 cleanups +Patch0: gnome-multi-writer-Various-C99-cleanups.patch +Patch1: gnome-multi-writer-Use-G_DECLARE_FINAL_TYPE.patch BuildRequires: docbook-utils-minimal BuildRequires: gobject-introspection-devel >= 0.9.8 ++++++ gnome-multi-writer-Use-G_DECLARE_FINAL_TYPE.patch ++++++ ++++ 943 lines (skipped) ++++++ gnome-multi-writer-Various-C99-cleanups.patch ++++++ ++++ 700 lines (skipped)

1 0

commit epiphany for openSUSE:Factory
by root 28 Dec '18

28 Dec '18

Hello community, here is the log from the commit of package epiphany for openSUSE:Factory checked in at 2018-12-28 12:36:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/epiphany (Old) and /work/SRC/openSUSE:Factory/.epiphany.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "epiphany" Fri Dec 28 12:36:10 2018 rev:159 rq:661750 version:3.30.2 Changes: -------- --- /work/SRC/openSUSE:Factory/epiphany/epiphany.changes 2018-10-25 09:12:29.478284454 +0200 +++ /work/SRC/openSUSE:Factory/.epiphany.new.28833/epiphany.changes 2018-12-28 12:36:12.479926277 +0100 @@ -1,0 +2,17 @@ +Thu Dec 27 23:22:15 UTC 2018 - bjorn.lie(a)gmail.com + +- Add upstream bug fix patches from stable branch: + + epiphany-window-Set-correct-current-height.patch: window: set + correct current height. + + epiphany-encoding-dialog-add-some-column-spacing.patch: + encoding-dialog: add some column spacing to grid. + + epiphany-web-view-Handle-NULL-URIs.patch: web-view: Handle NULL + URIs in ephy_web_view_set_address(). + + epiphany-Tags-with-empty-labels.patch: Tags with empty labels + are no longer allowed in bookmarks. + + epiphany-Fix-saving-web-app-icons.patch: Fix saving web app + icons when changed. + + epiphany-Fix-remote-inspector-support.patch: Fix remote + inspector support. + +------------------------------------------------------------------- New: ---- epiphany-Fix-remote-inspector-support.patch epiphany-Fix-saving-web-app-icons.patch epiphany-Tags-with-empty-labels.patch epiphany-encoding-dialog-add-some-column-spacing.patch epiphany-web-view-Handle-NULL-URIs.patch epiphany-window-Set-correct-current-height.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epiphany.spec ++++++ --- /var/tmp/diff_new_pack.1PNV0g/_old 2018-12-28 12:36:12.871926002 +0100 +++ /var/tmp/diff_new_pack.1PNV0g/_new 2018-12-28 12:36:12.875926000 +0100 @@ -25,6 +25,18 @@ URL: https://wiki.gnome.org/Apps/Web Source0: https://download.gnome.org/sources/epiphany/3.30/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM epiphany-window-Set-correct-current-height.patch -- window: set correct current height +Patch0: epiphany-window-Set-correct-current-height.patch +# PATCH-FIX-UPSTREAM epiphany-encoding-dialog-add-some-column-spacing.patch -- encoding-dialog: add some column spacing to grid +Patch1: epiphany-encoding-dialog-add-some-column-spacing.patch +# PATCH-FIX-UPSTREAM epiphany-web-view-Handle-NULL-URIs.patch -- web-view: Handle NULL URIs in ephy_web_view_set_address() +Patch2: epiphany-web-view-Handle-NULL-URIs.patch +# PATCH-FIX-UPSTREAM epiphany-Tags-with-empty-labels.patch -- Tags with empty labels are no longer allowed in bookmarks +Patch3: epiphany-Tags-with-empty-labels.patch +# PATCH-FIX-UPSTREAM epiphany-Fix-saving-web-app-icons.patch -- Fix saving web app icons when changed +Patch4: epiphany-Fix-saving-web-app-icons.patch +# PATCH-FIX-UPSTREAM epiphany-Fix-remote-inspector-support.patch -- Fix remote inspector support +Patch5: epiphany-Fix-remote-inspector-support.patch BuildRequires: fdupes BuildRequires: meson ++++++ epiphany-Fix-remote-inspector-support.patch ++++++ >From 58d5eb7ec0b37e7e9964e4fe8a8da27e7e5b2070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Yhuel?= <loic.yhuel(a)softathome.com> Date: Thu, 20 Dec 2018 12:39:29 +0000 Subject: [PATCH] Fix remote inspector support Commit 11293728 broke inspector:// URLs : the scheme isn't known by g_app_info_get_default_for_uri_scheme, so it triggers a search. Fixes #600 (cherry picked from commit e3cc0433404caec9e909232ef159fc4ff3fbb146) --- embed/ephy-web-view.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h index bd4a6c1b8..8f8ca5c8e 100644 --- a/embed/ephy-web-view.h +++ b/embed/ephy-web-view.h @@ -40,7 +40,8 @@ G_DECLARE_FINAL_TYPE (EphyWebView, ephy_web_view, EPHY, WEB_VIEW, WebKitWebView) "^https?://[^/\\.[:space:]]+.*$|" \ "^about:.*$|" \ "^data:.*$|" \ - "^file:.*$" \ + "^file:.*$|" \ + "^inspector://.*$" \ ")" #define EPHY_WEB_VIEW_DOMAIN_REGEX "^localhost(\\.[^[:space:]]+)?(:\\d+)?(:[0-9]+)?(/.*)?$|" \ -- 2.18.1 ++++++ epiphany-Fix-saving-web-app-icons.patch ++++++ >From 26d9b288244e5d5e715bcf860b0a200989ecc02d Mon Sep 17 00:00:00 2001 From: Michael Catanzaro <mcatanzaro(a)igalia.com> Date: Sun, 16 Dec 2018 14:40:27 -0600 Subject: [PATCH] Fix saving web app icons when changed >From 64a3330ced0ac6fe34b57d09a525e31cb30c350e --- lib/ephy-web-app-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ephy-web-app-utils.c b/lib/ephy-web-app-utils.c index 422519424..94abf9bda 100644 --- a/lib/ephy-web-app-utils.c +++ b/lib/ephy-web-app-utils.c @@ -726,7 +726,7 @@ ephy_web_application_save (EphyWebApplication *app) g_free (name); icon = g_key_file_get_string (key, "Desktop Entry", "Icon", NULL); - if (g_strcmp0 (name, app->icon_url) != 0) { + if (g_strcmp0 (icon, app->icon_url) != 0) { changed = TRUE; g_key_file_set_string (key, "Desktop Entry", "Icon", app->icon_url); } -- 2.18.1 ++++++ epiphany-Tags-with-empty-labels.patch ++++++ >From 77fab98a0ad4a33a8bfdb137afdda15973bea375 Mon Sep 17 00:00:00 2001 From: Aral Balkan <aral(a)aralbalkan.com> Date: Thu, 29 Nov 2018 22:30:46 +0000 Subject: [PATCH] Tags with empty labels are no longer allowed in bookmarks --- src/bookmarks/ephy-bookmark-properties-grid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bookmarks/ephy-bookmark-properties-grid.c b/src/bookmarks/ephy-bookmark-properties-grid.c index 3bdd7013e..0706b33f9 100644 --- a/src/bookmarks/ephy-bookmark-properties-grid.c +++ b/src/bookmarks/ephy-bookmark-properties-grid.c @@ -265,7 +265,7 @@ ephy_bookmark_properties_grid_buffer_text_changed_cb (EphyBookmarkPropertiesGrid group = gtk_widget_get_action_group (GTK_WIDGET (self), "grid"); action = g_action_map_lookup_action (G_ACTION_MAP (group), "add-tag"); text = gtk_entry_buffer_get_text (buffer); - if (ephy_bookmarks_manager_tag_exists (self->manager, text)) + if (ephy_bookmarks_manager_tag_exists (self->manager, text) || g_strcmp0 (text, "") == 0) g_simple_action_set_enabled (G_SIMPLE_ACTION (action), FALSE); else g_simple_action_set_enabled (G_SIMPLE_ACTION (action), TRUE); -- 2.18.1 ++++++ epiphany-encoding-dialog-add-some-column-spacing.patch ++++++ >From 86ac30111bc2031cd9738800c3322cd9fa8aca45 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro <mcatanzaro(a)igalia.com> Date: Tue, 13 Nov 2018 17:14:03 -0600 Subject: [PATCH] encoding-dialog: add some column spacing to grid This avoids the label from pushing up against the toggle button if the translation is long. Fixes #576 --- src/resources/gtk/encoding-dialog.ui | 1 + 1 file changed, 1 insertion(+) diff --git a/src/resources/gtk/encoding-dialog.ui b/src/resources/gtk/encoding-dialog.ui index 9d158df81..a46ce5bc5 100644 --- a/src/resources/gtk/encoding-dialog.ui +++ b/src/resources/gtk/encoding-dialog.ui @@ -21,6 +21,7 @@ <property name="visible">True</property> <property name="hexpand">True</property> <property name="orientation">horizontal</property> + <property name="column-spacing">6</property> <child> <object class="GtkLabel"> <property name="visible">True</property> -- 2.18.1 ++++++ epiphany-web-view-Handle-NULL-URIs.patch ++++++ >From 9da12c4843143124d2f57e968b5034e30048834b Mon Sep 17 00:00:00 2001 From: Michael Catanzaro <mcatanzaro(a)igalia.com> Date: Tue, 27 Nov 2018 14:27:49 -0600 Subject: [PATCH] web-view: Handle NULL URIs in ephy_web_view_set_address() This is possible if the web view has not loaded anything yet. Fixes #590 --- embed/ephy-web-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c index 835cd6e0b..84fa0a49a 100644 --- a/embed/ephy-web-view.c +++ b/embed/ephy-web-view.c @@ -1095,7 +1095,7 @@ ephy_web_view_set_address (EphyWebView *view, view->address = g_strdup (address); g_free (view->display_address); - view->display_address = ephy_uri_decode (view->address); + view->display_address = view->address != NULL ? ephy_uri_decode (view->address) : NULL; _ephy_web_view_set_is_blank (view, ephy_embed_utils_url_is_empty (address)); -- 2.18.1 ++++++ epiphany-window-Set-correct-current-height.patch ++++++ >From db22b3e699cfa595746fc4c707de3db1fec1c969 Mon Sep 17 00:00:00 2001 From: Jonathan Kang <jonathankang(a)gnome.org> Date: Mon, 5 Nov 2018 13:08:03 +0000 Subject: [PATCH] window: set correct current height Fixes 9c3b0a6f https://gitlab.gnome.org/GNOME/epiphany/issues/571 (cherry picked from commit 408d2118cceb4cade781087cc27bfc0d4b930c6e) --- src/ephy-window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ephy-window.c b/src/ephy-window.c index d0c0f3d04..a5bfda433 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -2808,7 +2808,7 @@ ephy_window_configure_event (GtkWidget *widget, &window->current_x, &window->current_y); window->current_width = width; - window->current_width = height; + window->current_height = height; } return result; -- 2.18.1

1 0

commit libusb3380 for openSUSE:Factory
by root 28 Dec '18

28 Dec '18

Hello community, here is the log from the commit of package libusb3380 for openSUSE:Factory checked in at 2018-12-28 12:36:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libusb3380 (Old) and /work/SRC/openSUSE:Factory/.libusb3380.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libusb3380" Fri Dec 28 12:36:09 2018 rev:2 rq:661729 version:0.0.0+git.20181025 Changes: -------- --- /work/SRC/openSUSE:Factory/libusb3380/libusb3380.changes 2018-01-05 00:58:51.727061003 +0100 +++ /work/SRC/openSUSE:Factory/.libusb3380.new.28833/libusb3380.changes 2018-12-28 12:36:10.843927423 +0100 @@ -1,0 +2,9 @@ +Tue Dec 18 19:51:26 UTC 2018 - mardnh(a)gmx.de + +- Update to version 0.0.0+git.20181025: + * rework logging system + * add usb3380_context_init_ex() for creating specific device + * api: MSI interrupt handling + * add reconfiguration for IN fifo + +------------------------------------------------------------------- Old: ---- libusb3380-0.0.0+git.20171214.tar.xz New: ---- libusb3380-0.0.0+git.20181025.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libusb3380.spec ++++++ --- /var/tmp/diff_new_pack.0PECIf/_old 2018-12-28 12:36:11.227927155 +0100 +++ /var/tmp/diff_new_pack.0PECIf/_new 2018-12-28 12:36:11.227927155 +0100 @@ -1,6 +1,7 @@ # # spec file for package libusb3380 # +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017, Martin Hauke <mardnh(a)gmx.de> # # All modifications and additions to the file contributed by third parties @@ -19,12 +20,13 @@ %define sover 0 %define libname libusb3380-%{sover} Name: libusb3380 -Version: 0.0.0+git.20171214 +Version: 0.0.0+git.20181025 Release: 0 Summary: USB3380 abstraction layer for libusb -License: LGPL-2.1 +License: LGPL-2.1-only Group: Development/Libraries/C and C++ URL: http://xtrx.io +#Git-Clone: https://github.com/xtrx-sdr/libusb3380.git Source: %{name}-%{version}.tar.xz Patch0: libusb3380-cmake-fix-compiler-setup.patch BuildRequires: cmake @@ -70,7 +72,8 @@ %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} -%doc LICENSE README.md +%license LICENSE +%doc README.md %{_libdir}/libusb3380.so.%{sover}* %files devel ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.0PECIf/_old 2018-12-28 12:36:11.255927135 +0100 +++ /var/tmp/diff_new_pack.0PECIf/_new 2018-12-28 12:36:11.255927135 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/xtrx-sdr/libusb3380.git</param> - <param name="changesrevision">ed7c1433fe57f57da98fd2e074c716184287a8a7</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">acb94d4b3730bc252f528c8da1ece06930507986</param></service></servicedata> \ No newline at end of file ++++++ libusb3380-0.0.0+git.20171214.tar.xz -> libusb3380-0.0.0+git.20181025.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/.git/ORIG_HEAD new/libusb3380-0.0.0+git.20181025/.git/ORIG_HEAD --- old/libusb3380-0.0.0+git.20171214/.git/ORIG_HEAD 2017-12-14 17:04:58.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/.git/ORIG_HEAD 2018-10-25 18:51:26.000000000 +0200 @@ -1 +1 @@ -ed7c1433fe57f57da98fd2e074c716184287a8a7 +acb94d4b3730bc252f528c8da1ece06930507986 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/.git/hooks/fsmonitor-watchman.sample new/libusb3380-0.0.0+git.20181025/.git/hooks/fsmonitor-watchman.sample --- old/libusb3380-0.0.0+git.20171214/.git/hooks/fsmonitor-watchman.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/.git/hooks/fsmonitor-watchman.sample 2018-10-25 18:51:26.000000000 +0200 @@ -0,0 +1,114 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 1) and a time in nanoseconds +# formatted as a string and outputs to stdout all files that have been +# modified since the given time. Paths must be relative to the root of +# the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $time) = @ARGV; + +# Check the hook interface version + +if ($version == 1) { + # convert nanoseconds to seconds + $time = int $time / 1000000000; +} else { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree; +if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $git_work_tree = Win32::GetCwd(); + $git_work_tree =~ tr/\\/\//; +} else { + require Cwd; + $git_work_tree = Cwd::cwd(); +} + +my $retry = 1; + +launch_watchman(); + +sub launch_watchman { + + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $time but were not transient (ie created after + # $time but no longer exist). + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + # + # The category of transient files that we want to ignore will have a + # creation clock (cclock) newer than $time_t value and will also not + # currently exist. + + my $query = <<" END"; + ["query", "$git_work_tree", { + "since": $time, + "fields": ["name"], + "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] + }] + END + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; <CHLD_OUT>}; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + my $json_pkg; + eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; + } or do { + require JSON::PP; + $json_pkg = "JSON::PP"; + }; + + my $o = $json_pkg->new->utf8->decode($response); + + if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { + print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; + $retry--; + qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + print "/\0"; + eval { launch_watchman() }; + exit 0; + } + + die "Watchman: $o->{error}.\n" . + "Falling back to scanning...\n" if $o->{error}; + + binmode STDOUT, ":utf8"; + local $, = "\0"; + print @{$o->{files}}; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/.git/hooks/pre-rebase.sample new/libusb3380-0.0.0+git.20181025/.git/hooks/pre-rebase.sample --- old/libusb3380-0.0.0+git.20171214/.git/hooks/pre-rebase.sample 2017-12-14 17:04:58.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/.git/hooks/pre-rebase.sample 2018-10-25 18:51:26.000000000 +0200 @@ -58,7 +58,7 @@ not_in_topic=`git rev-list "^$topic" master` if test -z "$not_in_topic" then - echo >&2 "$topic is already up-to-date with master" + echo >&2 "$topic is already up to date with master" exit 1 ;# we could allow it, but there is no point. else exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/.git/hooks/prepare-commit-msg.sample new/libusb3380-0.0.0+git.20181025/.git/hooks/prepare-commit-msg.sample --- old/libusb3380-0.0.0+git.20171214/.git/hooks/prepare-commit-msg.sample 2017-12-14 17:04:58.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/.git/hooks/prepare-commit-msg.sample 2018-10-25 18:51:26.000000000 +0200 @@ -9,8 +9,8 @@ # # To enable this hook, rename this file to "prepare-commit-msg". -# This hook includes three examples. The first comments out the -# "Conflicts:" part of a merge commit. +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. # # The second includes the output of "git diff --name-status -r" # into the message, just before the "git status" output. It is @@ -20,17 +20,23 @@ # The third example adds a Signed-off-by line to the message, that can # still be edited. This is rarely a good idea. -case "$2,$3" in - merge,) - /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$1" ;; +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" - *) ;; -esac +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^$.*>$.*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^$.*>$.*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi Binary files old/libusb3380-0.0.0+git.20171214/.git/index and new/libusb3380-0.0.0+git.20181025/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/.git/logs/HEAD new/libusb3380-0.0.0+git.20181025/.git/logs/HEAD --- old/libusb3380-0.0.0+git.20171214/.git/logs/HEAD 2017-12-14 17:04:58.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/.git/logs/HEAD 2018-10-25 18:51:26.000000000 +0200 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 ed7c1433fe57f57da98fd2e074c716184287a8a7 Martin Hauke <mardnh(a)gmx.de> 1513278120 +0100 clone: from /var/cache/obs/tar_scm/74c0865730baae1870ab5e19929a71f23f49a6118715d89d9c72b0c28ad092a8/libusb3380 -ed7c1433fe57f57da98fd2e074c716184287a8a7 ed7c1433fe57f57da98fd2e074c716184287a8a7 Martin Hauke <mardnh(a)gmx.de> 1513278121 +0100 reset: moving to origin/master +0000000000000000000000000000000000000000 acb94d4b3730bc252f528c8da1ece06930507986 Martin Hauke <mardnh(a)gmx.de> 1545162686 +0100 clone: from /var/cache/obs/tar_scm/74c0865730baae1870ab5e19929a71f23f49a6118715d89d9c72b0c28ad092a8/libusb3380 +acb94d4b3730bc252f528c8da1ece06930507986 acb94d4b3730bc252f528c8da1ece06930507986 Martin Hauke <mardnh(a)gmx.de> 1545162686 +0100 reset: moving to origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/.git/logs/refs/heads/master new/libusb3380-0.0.0+git.20181025/.git/logs/refs/heads/master --- old/libusb3380-0.0.0+git.20171214/.git/logs/refs/heads/master 2017-12-14 17:04:58.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/.git/logs/refs/heads/master 2018-10-25 18:51:26.000000000 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 ed7c1433fe57f57da98fd2e074c716184287a8a7 Martin Hauke <mardnh(a)gmx.de> 1513278120 +0100 clone: from /var/cache/obs/tar_scm/74c0865730baae1870ab5e19929a71f23f49a6118715d89d9c72b0c28ad092a8/libusb3380 +0000000000000000000000000000000000000000 acb94d4b3730bc252f528c8da1ece06930507986 Martin Hauke <mardnh(a)gmx.de> 1545162686 +0100 clone: from /var/cache/obs/tar_scm/74c0865730baae1870ab5e19929a71f23f49a6118715d89d9c72b0c28ad092a8/libusb3380 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/.git/logs/refs/remotes/origin/HEAD new/libusb3380-0.0.0+git.20181025/.git/logs/refs/remotes/origin/HEAD --- old/libusb3380-0.0.0+git.20171214/.git/logs/refs/remotes/origin/HEAD 2017-12-14 17:04:58.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/.git/logs/refs/remotes/origin/HEAD 2018-10-25 18:51:26.000000000 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 ed7c1433fe57f57da98fd2e074c716184287a8a7 Martin Hauke <mardnh(a)gmx.de> 1513278120 +0100 clone: from /var/cache/obs/tar_scm/74c0865730baae1870ab5e19929a71f23f49a6118715d89d9c72b0c28ad092a8/libusb3380 +0000000000000000000000000000000000000000 acb94d4b3730bc252f528c8da1ece06930507986 Martin Hauke <mardnh(a)gmx.de> 1545162686 +0100 clone: from /var/cache/obs/tar_scm/74c0865730baae1870ab5e19929a71f23f49a6118715d89d9c72b0c28ad092a8/libusb3380 Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/0a/680c0f1e9881a381b264bf11f8de48370a74db and new/libusb3380-0.0.0+git.20181025/.git/objects/0a/680c0f1e9881a381b264bf11f8de48370a74db differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/0c/e4c12d064cc9754440ca0907ef35cc8a592a2b and new/libusb3380-0.0.0+git.20181025/.git/objects/0c/e4c12d064cc9754440ca0907ef35cc8a592a2b differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/.git/objects/12/25b68ad2c665a75f8c71c5b35541b0cfeeef48 new/libusb3380-0.0.0+git.20181025/.git/objects/12/25b68ad2c665a75f8c71c5b35541b0cfeeef48 --- old/libusb3380-0.0.0+git.20171214/.git/objects/12/25b68ad2c665a75f8c71c5b35541b0cfeeef48 1970-01-01 01:00:00.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/.git/objects/12/25b68ad2c665a75f8c71c5b35541b0cfeeef48 2018-10-25 18:51:26.000000000 +0200 @@ -0,0 +1 @@ +xÎ»N1aj?ÅôHÑìø¶Jz<ÙE^'·g' <_qôËz>·ñatUpÅvibN5q€ŽìæØP$K-6P@2_Üu`Qòd3qD¢(e7ËŸxŠdIÉ%ÃñŸvxÑþŠ?pZ·ÁKfœÂÓv§ÃÇ+·~ã«nYaòvö1ú á-¢{óÐÿy3µ}CÝÓ^ÛRÖÛùÒ>ùy±YŠ \ No newline at end of file Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/12/eb48f3019962f36dd8fde65f0dac8db283c428 and new/libusb3380-0.0.0+git.20181025/.git/objects/12/eb48f3019962f36dd8fde65f0dac8db283c428 differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/20/ada2c57af6a53bed89d85182906cbb879ea001 and new/libusb3380-0.0.0+git.20181025/.git/objects/20/ada2c57af6a53bed89d85182906cbb879ea001 differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/22/d40e3e5dab6e389c8dc2da46c8c96cff21ecf9 and new/libusb3380-0.0.0+git.20181025/.git/objects/22/d40e3e5dab6e389c8dc2da46c8c96cff21ecf9 differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/2b/1d582bc6d40520b580e3e83271b9b0bb3215ee and new/libusb3380-0.0.0+git.20181025/.git/objects/2b/1d582bc6d40520b580e3e83271b9b0bb3215ee differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/30/3f5dbb170572fe128331b6630e24b0910967e5 and new/libusb3380-0.0.0+git.20181025/.git/objects/30/3f5dbb170572fe128331b6630e24b0910967e5 differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/30/cb13b2a70efcbd00ce2b48c70e4c5a2932e249 and new/libusb3380-0.0.0+git.20181025/.git/objects/30/cb13b2a70efcbd00ce2b48c70e4c5a2932e249 differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/4d/56a491aa9f9a7282ed4d54a566dcbcfd362602 and new/libusb3380-0.0.0+git.20181025/.git/objects/4d/56a491aa9f9a7282ed4d54a566dcbcfd362602 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/.git/objects/59/11b0819a1bba6da72c734c79af41d22990bf11 new/libusb3380-0.0.0+git.20181025/.git/objects/59/11b0819a1bba6da72c734c79af41d22990bf11 --- old/libusb3380-0.0.0+git.20171214/.git/objects/59/11b0819a1bba6da72c734c79af41d22990bf11 1970-01-01 01:00:00.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/.git/objects/59/11b0819a1bba6da72c734c79af41d22990bf11 2018-10-25 18:51:26.000000000 +0200 @@ -0,0 +1 @@ +xÎKjB1á³3$¯äH§Rè€+8 âMÉîŸâÀ8ý?µË¥ðÅŸ.ÞsŽdb<& eŠÂäc¢Bs"Uït6?Øe ÉÅTŠ¬Sf²#e\Ÿd, ^Çwëð%ý$ðÑÖËå»õ¶çgzW¬ýo²n©íÁMîî(É[ØØ`¡yÈkn¡µEëéÚqÔ¶Þ©OÐªÍüG]§ \ No newline at end of file Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/62/d98e46fa05fd35281d9f7306c17724ac8c2432 and new/libusb3380-0.0.0+git.20181025/.git/objects/62/d98e46fa05fd35281d9f7306c17724ac8c2432 differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/65/0cbda23267a3fd8f8cacae85e12d45217ed9b4 and new/libusb3380-0.0.0+git.20181025/.git/objects/65/0cbda23267a3fd8f8cacae85e12d45217ed9b4 differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/7e/10eb39f92dcded73866538247438108ba072af and new/libusb3380-0.0.0+git.20181025/.git/objects/7e/10eb39f92dcded73866538247438108ba072af differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/93/94c853c3b8417af80218b6a698a8e573d95344 and new/libusb3380-0.0.0+git.20181025/.git/objects/93/94c853c3b8417af80218b6a698a8e573d95344 differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/9e/555415e438d88a9c98087b946642b00b5f9edf and new/libusb3380-0.0.0+git.20181025/.git/objects/9e/555415e438d88a9c98087b946642b00b5f9edf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/.git/objects/ac/b94d4b3730bc252f528c8da1ece06930507986 new/libusb3380-0.0.0+git.20181025/.git/objects/ac/b94d4b3730bc252f528c8da1ece06930507986 --- old/libusb3380-0.0.0+git.20171214/.git/objects/ac/b94d4b3730bc252f528c8da1ece06930507986 1970-01-01 01:00:00.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/.git/objects/ac/b94d4b3730bc252f528c8da1ece06930507986 2018-10-25 18:51:26.000000000 +0200 @@ -0,0 +1 @@ +xÎ;®Â0@Qj¯bz$4ñ/cé ÑS²3 $~² Ý(Xí)®nÊË27Ð=nZÍÝàHsòE§¡!£û#³ÑQÿ±ÈÚ sÎŸÅbHzÖ{«ß1È0ªxkç\à$e'smqå(wø«Ú]Ÿtã\ñ.uò:gÑ×äaQ¥ÏsßÔTG.žæi× ê³6YÔoXXû \ No newline at end of file Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/c4/976cb0d6875b6b97a3b67de20a6cb4bd9a80b0 and new/libusb3380-0.0.0+git.20181025/.git/objects/c4/976cb0d6875b6b97a3b67de20a6cb4bd9a80b0 differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/d6/26c6868221b40d1c8df18b21c101835bbf5361 and new/libusb3380-0.0.0+git.20181025/.git/objects/d6/26c6868221b40d1c8df18b21c101835bbf5361 differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/d7/c5f3ae5d4363c7224823d580b92d064be87d41 and new/libusb3380-0.0.0+git.20181025/.git/objects/d7/c5f3ae5d4363c7224823d580b92d064be87d41 differ Binary files old/libusb3380-0.0.0+git.20171214/.git/objects/ea/e47660c5a1d594d2d53ace18befb76f8327e93 and new/libusb3380-0.0.0+git.20181025/.git/objects/ea/e47660c5a1d594d2d53ace18befb76f8327e93 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/.git/packed-refs new/libusb3380-0.0.0+git.20181025/.git/packed-refs --- old/libusb3380-0.0.0+git.20171214/.git/packed-refs 2017-12-14 17:04:58.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/.git/packed-refs 2018-10-25 18:51:26.000000000 +0200 @@ -1,2 +1,2 @@ -# pack-refs with: peeled fully-peeled -ed7c1433fe57f57da98fd2e074c716184287a8a7 refs/remotes/origin/master +# pack-refs with: peeled fully-peeled sorted +acb94d4b3730bc252f528c8da1ece06930507986 refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/.git/refs/heads/master new/libusb3380-0.0.0+git.20181025/.git/refs/heads/master --- old/libusb3380-0.0.0+git.20171214/.git/refs/heads/master 2017-12-14 17:04:58.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/.git/refs/heads/master 2018-10-25 18:51:26.000000000 +0200 @@ -1 +1 @@ -ed7c1433fe57f57da98fd2e074c716184287a8a7 +acb94d4b3730bc252f528c8da1ece06930507986 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/CMakeLists.txt new/libusb3380-0.0.0+git.20181025/CMakeLists.txt --- old/libusb3380-0.0.0+git.20171214/CMakeLists.txt 2017-12-14 17:04:58.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/CMakeLists.txt 2018-10-25 18:51:26.000000000 +0200 @@ -56,7 +56,12 @@ include_directories(${LIBUSB_1_INCLUDE_DIRS}) include_directories(.) -add_library(usb3380 SHARED libusb3380.c) +set(USB3380_FILES libusb3380.c) +if(CMAKE_SYSTEM_NAME MATCHES "Windows") + set(USB3380_FILES ${USB3380_FILES} xtrx_port.c) +endif() + +add_library(usb3380 SHARED ${USB3380_FILES}) target_link_libraries(usb3380 ${LIBUSB_1_LIBRARIES} ${SYSTEM_LIBS}) set_target_properties(usb3380 PROPERTIES VERSION ${LIBVER} SOVERSION ${MAJOR_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/libusb3380.c new/libusb3380-0.0.0+git.20181025/libusb3380.c --- old/libusb3380-0.0.0+git.20171214/libusb3380.c 2017-12-14 17:04:58.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/libusb3380.c 2018-10-25 18:51:26.000000000 +0200 @@ -72,12 +72,6 @@ } libusb3380_pci_master_stage_t; -typedef enum libusb3380_qtype { - Q_PCIOUT, - Q_GPEP, - Q_MSI, -} libusb3380_qtype_t; - /** Internal queue element */ typedef struct libusb3380_data_qbase { union { @@ -86,7 +80,6 @@ libusb3380_qpci_master_t *ppcims; libusb3380_qmsi_int_t *pmsi; } blk; - libusb3380_qtype_t type; } libusb3380_data_qbase_t; @@ -95,7 +88,10 @@ typedef struct libusb3380_queue_header { libusb3380_data_qbase_t queue; - pthread_mutex_t qmutex; + union { + pthread_mutex_t qmutex; + unsigned gpep_idx[2]; + }; struct libusb_transfer *transfer; } libusb3380_queue_header_t; @@ -106,9 +102,16 @@ /* currently we supports only one device */ struct libusb3380_pcidev *dev; + libusb3380_configuration_t cfg; + unsigned total_gpeps; + unsigned gpep_in_idx_st[LIBUSB3380_GPEP_COUNT]; + unsigned gpep_out_idx_st[LIBUSB3380_GPEP_COUNT]; + + libusb3380_queue_header_t *q_gpep; + libusb3380_qgpep_t *gpep; + + libusb3380_queue_header_t q_pciout; - libusb3380_queue_header_t q_gpep_out[LIBUSB3380_GPEP_COUNT]; - libusb3380_queue_header_t q_gpep_in[LIBUSB3380_GPEP_COUNT]; libusb3380_queue_header_t q_msi; @@ -122,11 +125,6 @@ libusb3380_qmsi_int_t msi; sem_t msi_notify; - /* GPEP OUT */ - libusb3380_qgpep_t gpep_out[LIBUSB3380_GPEP_COUNT]; - /* GPEP IN */ - libusb3380_qgpep_t gpep_in[LIBUSB3380_GPEP_COUNT]; - libusb3380_qcsr_t csr; sem_t csr_notify; @@ -139,13 +137,25 @@ /* interrupt RCIN */ uint32_t msi_data[4]; + on_msi_cb_t msi_cb; + void* msi_param; + bool stop; } libusb3380_async_manager_t; -static void def_log(libusb3380_loglevel_t level, void* obj, - const char* message, ...) __attribute__ ((format (printf, 3, 4))); - -void def_log(libusb3380_loglevel_t level, void* obj, const char* message, ...) +static void def_log(libusb3380_loglevel_t level, + void* obj, + const char* func, + const char* file, + int line, + const char* message, ...) __attribute__ ((format (printf, 6, 7))); + +void def_log(libusb3380_loglevel_t level, + void* obj, + const char* func, + const char* file, + int line, + const char* message, ...) { (void)obj; @@ -165,7 +175,7 @@ vsnprintf(tmp_buf, sizeof(tmp_buf), message, ap); va_end(ap); - fprintf(stderr, "%s %s\n", sevirity, tmp_buf); + fprintf(stderr, "%s %-16s %s\n", sevirity, func, tmp_buf); } static usb3380_logfunc_t s_logfunc = def_log; @@ -173,14 +183,14 @@ static libusb3380_loglevel_t s_loglevel = USB3380_LOG_INFO; #define LOG(x, ...) do { \ - if (s_loglevel >= (x)) s_logfunc((x), s_logobj, __VA_ARGS__); \ + if (s_loglevel >= (x)) s_logfunc((x), s_logobj, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__); \ } while(0) -#define LOG_ERR(...) LOG(USB3380_LOG_ERROR, __VA_ARGS__) -#define LOG_WARN(...) LOG(USB3380_LOG_WARNING, __VA_ARGS__) -#define LOG_INFO(...) LOG(USB3380_LOG_INFO, __VA_ARGS__) +#define LOG_ERR(...) LOG(USB3380_LOG_ERROR, __VA_ARGS__) +#define LOG_WARN(...) LOG(USB3380_LOG_WARNING, __VA_ARGS__) +#define LOG_INFO(...) LOG(USB3380_LOG_INFO, __VA_ARGS__) #define LOG_DEBUG(...) LOG(USB3380_LOG_DEBUG, __VA_ARGS__) -#define LOG_DUMP(...) LOG(USB3380_LOG_DUMP, __VA_ARGS__) +#define LOG_DUMP(...) LOG(USB3380_LOG_DUMP, __VA_ARGS__) void usb3380_set_logfunc(usb3380_logfunc_t func, void *param) { @@ -255,7 +265,22 @@ return -res; q->transfer = libusb_alloc_transfer(0); - if (res) + if (q->transfer == NULL) + return -ENOMEM; + + q->queue.blk.pbase = NULL; + return 0; +} + + +static int usb3380_int_queue_gpep_init(libusb3380_queue_header_t *q, + unsigned gpepno, unsigned idx) +{ + q->gpep_idx[0] = gpepno; + q->gpep_idx[1] = idx; + + q->transfer = libusb_alloc_transfer(0); + if (q->transfer == NULL) return -ENOMEM; q->queue.blk.pbase = NULL; @@ -268,6 +293,12 @@ libusb_free_transfer(q->transfer); } +static void usb3380_int_queue_gpep_deinit(libusb3380_queue_header_t *q) +{ + libusb_free_transfer(q->transfer); +} + + static void* usb3380_io_thread(void *arg) { struct libusb3380_async_manager* mgr = (struct libusb3380_async_manager*)arg; @@ -282,7 +313,7 @@ pthread_sigmask(SIG_SETMASK, &set, NULL); struct sched_param shed; - shed.sched_priority = 1; + shed.sched_priority = 2; res = pthread_setschedparam(pthread_self(), SCHED_FIFO, &shed); if (res) { @@ -319,15 +350,31 @@ base->status = DQS_TIMEOUT; break; - case LIBUSB_TRANSFER_ERROR: case LIBUSB_TRANSFER_CANCELLED: + base->status = DQS_CANCELLED; + break; + + case LIBUSB_TRANSFER_STALL: + /* TODO clear EP */ + LOG_ERR("GPEP 0x%02x ERROR: STALL", transfer->endpoint); + base->status = DQS_ABORT; + break; - case LIBUSB_TRANSFER_STALL: /* TODO clear EP */ case LIBUSB_TRANSFER_NO_DEVICE: + LOG_ERR("GPEP 0x%02x ERROR: NO DEVICE", transfer->endpoint); + base->status = DQS_ABORT; + break; case LIBUSB_TRANSFER_OVERFLOW: - LOG_ERR("GPEP IN ERROR: %d", transfer->status); + LOG_ERR("GPEP 0x%02x ERROR: OVERFLOW", transfer->endpoint); + base->status = DQS_ABORT; + break; + + default: + case LIBUSB_TRANSFER_ERROR: + LOG_ERR("GPEP 0x%02x ERROR: %d", transfer->endpoint, transfer->status); base->status = DQS_ABORT; + break; } base->written = (unsigned)transfer->actual_length; @@ -342,7 +389,7 @@ assert(res == 0); } -static void on_pciout_cb(struct libusb_transfer *transfer) +static LIBUSB_CALL void on_pciout_cb(struct libusb_transfer *transfer) { libusb3380_async_manager_t* mgr = (libusb3380_async_manager_t*)transfer->user_data; libusb3380_qpci_master_t* pciout = &mgr->pciout; @@ -352,7 +399,7 @@ pciout->data[0], pciout->data[1], transfer->status); -#if 1 + if (transfer->status == LIBUSB_TRANSFER_COMPLETED && transfer->actual_length == transfer->length && pciout->type == RC_PCIE_READ && @@ -369,7 +416,7 @@ // Notify abortion transfer->status = LIBUSB_TRANSFER_ERROR; } -#endif + // Notify waiting thread notify_pciout(mgr); } @@ -388,7 +435,7 @@ mgr->q_pciout.transfer->flags = 0; } -static void on_rcin_cb(struct libusb_transfer *transfer) +static LIBUSB_CALL void on_rcin_cb(struct libusb_transfer *transfer) { libusb3380_async_manager_t* mgr = (libusb3380_async_manager_t*)transfer->user_data; int res; @@ -416,16 +463,18 @@ assert(res == 0); } -static void prepare_ptransfer_rcin(libusb3380_async_manager_t* mgr) +static void prepare_ptransfer_rcin(libusb3380_async_manager_t* mgr, + libusb_transfer_cb_fn callback, + unsigned timeout) { libusb_fill_interrupt_transfer(mgr->q_msi.transfer, mgr->dev->ctx->handle, EP_RCIN | LIBUSB_ENDPOINT_IN, (uint8_t*)mgr->msi_data, 16, - on_rcin_cb, + callback, mgr, - 100); + timeout); mgr->q_msi.transfer->flags = 0; } @@ -475,23 +524,6 @@ if (res) { goto failed_in_lock; } -#if 0 - if (type == RC_PCIE_READ && - mgr->q_pciout.transfer->actual_length == mgr->q_pciout.transfer->length) { - mgr->q_pciout.transfer->endpoint = EP_PCIIN | LIBUSB_ENDPOINT_IN; - mgr->q_pciout.transfer->length = dw_count * 4; - - res = libusb_submit_transfer(mgr->q_pciout.transfer); - if (res) { - goto failed_in_lock; // TODO error code - } - - res = sem_wait(&mgr->pciout_notify); - if (res) { - goto failed_in_lock; - } - } -#endif if (pciout->base.status == DQS_PARTIAL) { if (type == RC_PCIE_READ) { @@ -547,6 +579,7 @@ return res; } + prepare_ptransfer_rcin(mgr, on_rcin_cb, 100); res = libusb_submit_transfer(mgr->q_msi.transfer); if (res) { goto failed_in_lock; // TODO error code @@ -569,22 +602,72 @@ return res; } +static int libusb_to_errno(int libusberr) +{ + switch (libusberr) { + case LIBUSB_SUCCESS: + return 0; + + case LIBUSB_ERROR_IO: + return -EIO; + + case LIBUSB_ERROR_INVALID_PARAM: + return -EINVAL; + + case LIBUSB_ERROR_ACCESS: + return -EPERM; + + case LIBUSB_ERROR_NO_DEVICE: + return -ENODEV; + + case LIBUSB_ERROR_NOT_FOUND: + return -ENXIO; + + case LIBUSB_ERROR_BUSY: + return -EBUSY; + + case LIBUSB_ERROR_TIMEOUT: + return -ETIMEDOUT; + + case LIBUSB_ERROR_OVERFLOW: + return -EOVERFLOW; + + case LIBUSB_ERROR_PIPE: + return -EPIPE; + + case LIBUSB_ERROR_INTERRUPTED: + return -EINTR; + + case LIBUSB_ERROR_NO_MEM: + return -ENOMEM; + + case LIBUSB_ERROR_NOT_SUPPORTED: + return -EOPNOTSUPP; + + case LIBUSB_ERROR_OTHER: + return -ESRCH; //TODO find better; + }; + return -EFAULT; +} + static int gpep_transfer_post(libusb3380_queue_header_t* q, libusb3380_qgpep_t *d) { q->transfer->length = d->base.size; q->transfer->buffer = d->pdata; - return libusb_submit_transfer(q->transfer); + return libusb_to_errno(libusb_submit_transfer(q->transfer)); } -static void on_gpep_cb(struct libusb_transfer *transfer) +static LIBUSB_CALL void on_gpep_cb(struct libusb_transfer *transfer) { - LOG_DUMP("TransferCB EP:%02x done", transfer->endpoint); - libusb3380_queue_header_t* qh = (libusb3380_queue_header_t*)transfer->user_data; + + LOG_DUMP("TransferCB EP:%02x [%d;%d] done", transfer->endpoint, + qh->gpep_idx[0], qh->gpep_idx[1]); + fill_base_in_cb(qh->queue.blk.pbase, qh->transfer); - qh->queue.blk.pgpep->cb_done(qh->queue.blk.pgpep); + qh->queue.blk.pgpep->cb_done(qh->queue.blk.pgpep, qh->gpep_idx[0], qh->gpep_idx[1]); } static void prepare_ptransfer_gpep(libusb3380_async_manager_t* mgr, @@ -594,7 +677,6 @@ unsigned int timeout) { hdr->queue.blk.pgpep = queue; - hdr->queue.type = Q_GPEP; libusb_fill_bulk_transfer(hdr->transfer, mgr->dev->ctx->handle, @@ -610,13 +692,17 @@ int usb3380_async_gpep_out_post(struct libusb3380_async_manager* mgr, libusb3380_gpep_t ep_no, + unsigned idx, const uint8_t* data, unsigned size, on_gpep_cb_t cb, void* param) { if (ep_no > LIBUSB3380_GPEP3 || ep_no < LIBUSB3380_GPEP0) return -EINVAL; + if (mgr->cfg.gp_out_cnts[ep_no] <= idx) + return -EINVAL; - libusb3380_qgpep_t *gpep_out = &mgr->gpep_out[ep_no]; + unsigned gidx = mgr->gpep_out_idx_st[ep_no] + idx; + libusb3380_qgpep_t *gpep_out = &mgr->gpep[gidx]; // TODO check multi thread access gpep_out->base.size = size; @@ -624,18 +710,22 @@ gpep_out->cb_done = cb; gpep_out->param = param; - return gpep_transfer_post(&mgr->q_gpep_out[ep_no], gpep_out); + return gpep_transfer_post(&mgr->q_gpep[gidx], gpep_out); } int usb3380_async_gpep_in_post(struct libusb3380_async_manager* mgr, libusb3380_gpep_t ep_no, + unsigned idx, uint8_t* data, unsigned size, on_gpep_cb_t cb, void* param) { if (ep_no > LIBUSB3380_GPEP3 || ep_no < LIBUSB3380_GPEP0) return -EINVAL; + if (mgr->cfg.gp_in_cnts[ep_no] <= idx) + return -EINVAL; - libusb3380_qgpep_t *gpep_in = &mgr->gpep_in[ep_no]; + unsigned gidx = mgr->gpep_in_idx_st[ep_no] + idx; + libusb3380_qgpep_t *gpep_in = &mgr->gpep[gidx]; // TODO check multi thread access gpep_in->base.size = size; @@ -643,66 +733,118 @@ gpep_in->cb_done = cb; gpep_in->param = param; - return gpep_transfer_post(&mgr->q_gpep_in[ep_no], gpep_in); + return gpep_transfer_post(&mgr->q_gpep[gidx], gpep_in); +} + +int usb3380_async_gpep_cancel(struct libusb3380_async_manager* mgr, + bool ep_in, + libusb3380_gpep_t gpep, + unsigned idx) +{ + if (gpep > LIBUSB3380_GPEP3 || gpep < LIBUSB3380_GPEP0) + return -EINVAL; + + unsigned gidx; + if (ep_in) { + if (mgr->cfg.gp_in_cnts[gpep] <= idx) + return -EINVAL; + gidx = mgr->gpep_in_idx_st[gpep] + idx; + } else { + if (mgr->cfg.gp_out_cnts[gpep] <= idx) + return -EINVAL; + gidx = mgr->gpep_out_idx_st[gpep] + idx; + } + + return libusb_to_errno(libusb_cancel_transfer(mgr->q_gpep[gidx].transfer)); } int usb3380_async_set_gpep_timeout(struct libusb3380_async_manager* mgr, bool ep_in, libusb3380_gpep_t gpep, + unsigned idx, unsigned to_ms) { if (gpep > LIBUSB3380_GPEP3 || gpep < LIBUSB3380_GPEP0) return -EINVAL; + unsigned gidx; if (ep_in) { - mgr->q_gpep_in[gpep].transfer->timeout = to_ms; + if (mgr->cfg.gp_in_cnts[gpep] <= idx) + return -EINVAL; + gidx = mgr->gpep_in_idx_st[gpep] + idx; } else { - mgr->q_gpep_out[gpep].transfer->timeout = to_ms; + if (mgr->cfg.gp_out_cnts[gpep] <= idx) + return -EINVAL; + gidx = mgr->gpep_out_idx_st[gpep] + idx; } + mgr->q_gpep[gidx].transfer->timeout = to_ms; return 0; } - int usb3380_async_start(struct libusb3380_pcidev *dev, + const struct libusb3380_configuration *configuration, struct libusb3380_async_manager **out) { libusb3380_async_manager_t* mgr; int res; - unsigned ep_no; const unsigned def_timeout = 1000; - + unsigned idx; mgr = (libusb3380_async_manager_t*)malloc(sizeof(libusb3380_async_manager_t)); if (!mgr) return -ENOMEM; + memset(mgr, 0, sizeof(*mgr)); mgr->dev = dev; mgr->stop = false; - - res = usb3380_int_queue_init(&mgr->q_gpep_out[LIBUSB3380_GPEP0]); - if (res) - goto failed_gpep_out_0; - res = usb3380_int_queue_init(&mgr->q_gpep_out[LIBUSB3380_GPEP1]); - if (res) - goto failed_gpep_out_1; - res = usb3380_int_queue_init(&mgr->q_gpep_out[LIBUSB3380_GPEP2]); - if (res) - goto failed_gpep_out_2; - res = usb3380_int_queue_init(&mgr->q_gpep_out[LIBUSB3380_GPEP3]); - if (res) - goto failed_gpep_out_3; - - res = usb3380_int_queue_init(&mgr->q_gpep_in[LIBUSB3380_GPEP0]); - if (res) - goto failed_gpep_in_0; - res = usb3380_int_queue_init(&mgr->q_gpep_in[LIBUSB3380_GPEP1]); - if (res) - goto failed_gpep_in_1; - res = usb3380_int_queue_init(&mgr->q_gpep_in[LIBUSB3380_GPEP2]); - if (res) - goto failed_gpep_in_2; - res = usb3380_int_queue_init(&mgr->q_gpep_in[LIBUSB3380_GPEP3]); - if (res) - goto failed_gpep_in_3; + mgr->cfg = *configuration; + for (unsigned k = 0; k < LIBUSB3380_GPEP_COUNT; k++) { + mgr->total_gpeps += configuration->gp_in_cnts[k]; + mgr->total_gpeps += configuration->gp_out_cnts[k]; + } + + if (mgr->total_gpeps > 0) { + mgr->q_gpep = (libusb3380_queue_header_t*)malloc(sizeof(libusb3380_queue_header_t) * mgr->total_gpeps); + if (mgr->q_gpep == NULL) { + res = -ENOMEM; + goto q_gpep_alloc_fail; + } + mgr->gpep = (libusb3380_qgpep_t*)malloc(sizeof(libusb3380_qgpep_t) * mgr->total_gpeps); + if (mgr->gpep == NULL) { + res = -ENOMEM; + goto gpep_alloc_fail; + } + memset(mgr->q_gpep, 0, sizeof(libusb3380_queue_header_t) * mgr->total_gpeps); + memset(mgr->gpep, 0, sizeof(libusb3380_qgpep_t) * mgr->total_gpeps); + + idx = 0; + for (unsigned l = 0; l < LIBUSB3380_GPEP_COUNT; l++) { + mgr->gpep_in_idx_st[l] = idx; + for (unsigned m = 0; m < mgr->cfg.gp_in_cnts[l]; m++, idx++) { + res = usb3380_int_queue_gpep_init(&mgr->q_gpep[idx], l, m); + if (res) + goto failed_pciout; + prepare_ptransfer_gpep(mgr, + &mgr->q_gpep[idx], + &mgr->gpep[idx], + convert_gpep_no(l) | LIBUSB_ENDPOINT_IN, + def_timeout); + } + } + for (unsigned l = LIBUSB3380_GPEP_COUNT; l < 2 * LIBUSB3380_GPEP_COUNT; l++) { + mgr->gpep_out_idx_st[l - LIBUSB3380_GPEP_COUNT] = idx; + for (unsigned m = 0; m < mgr->cfg.gp_out_cnts[l - LIBUSB3380_GPEP_COUNT]; m++, idx++) { + res = usb3380_int_queue_gpep_init(&mgr->q_gpep[idx], l, m); + if (res) + goto failed_pciout; + prepare_ptransfer_gpep(mgr, + &mgr->q_gpep[idx], + &mgr->gpep[idx], + convert_gpep_no(l - LIBUSB3380_GPEP_COUNT) | LIBUSB_ENDPOINT_OUT, + def_timeout); + } + } + assert(mgr->total_gpeps == idx); + } res = usb3380_int_queue_init(&mgr->q_pciout); if (res) @@ -713,20 +855,6 @@ goto failed_msi; prepare_ptransfer_pciout(mgr); - prepare_ptransfer_rcin(mgr); - - for (ep_no = LIBUSB3380_GPEP0; ep_no < LIBUSB3380_GPEP_COUNT; ep_no++) { - prepare_ptransfer_gpep(mgr, - &mgr->q_gpep_out[ep_no], - &mgr->gpep_out[ep_no], - convert_gpep_no(ep_no) | LIBUSB_ENDPOINT_OUT, - def_timeout); - prepare_ptransfer_gpep(mgr, - &mgr->q_gpep_in[ep_no], - &mgr->gpep_in[ep_no], - convert_gpep_no(ep_no) | LIBUSB_ENDPOINT_IN, - def_timeout); - } res = sem_init(&mgr->pciout_notify, 0, 0); if (res) { @@ -757,30 +885,21 @@ failed_msi: usb3380_int_queue_deinit(&mgr->q_pciout); failed_pciout: - usb3380_int_queue_deinit(&mgr->q_gpep_in[LIBUSB3380_GPEP3]); -failed_gpep_in_3: - usb3380_int_queue_deinit(&mgr->q_gpep_in[LIBUSB3380_GPEP2]); -failed_gpep_in_2: - usb3380_int_queue_deinit(&mgr->q_gpep_in[LIBUSB3380_GPEP1]); -failed_gpep_in_1: - usb3380_int_queue_deinit(&mgr->q_gpep_in[LIBUSB3380_GPEP0]); -failed_gpep_in_0: - usb3380_int_queue_deinit(&mgr->q_gpep_out[LIBUSB3380_GPEP3]); -failed_gpep_out_3: - usb3380_int_queue_deinit(&mgr->q_gpep_out[LIBUSB3380_GPEP2]); -failed_gpep_out_2: - usb3380_int_queue_deinit(&mgr->q_gpep_out[LIBUSB3380_GPEP1]); -failed_gpep_out_1: - usb3380_int_queue_deinit(&mgr->q_gpep_out[LIBUSB3380_GPEP0]); -failed_gpep_out_0: + for (idx = 0; idx < mgr->total_gpeps; idx++) { + if (mgr->q_gpep[idx].transfer) { + usb3380_int_queue_gpep_deinit(&mgr->q_gpep[idx]); + } + } + free(mgr->q_gpep); +gpep_alloc_fail: + free(mgr->gpep); +q_gpep_alloc_fail: free(mgr); return res; } int usb3380_async_stop(struct libusb3380_async_manager* mgr) { - unsigned ep_no; - mgr->stop = true; pthread_join(mgr->io_thread, NULL); @@ -789,10 +908,11 @@ usb3380_int_queue_deinit(&mgr->q_msi); usb3380_int_queue_deinit(&mgr->q_pciout); - for (ep_no = LIBUSB3380_GPEP0; ep_no < LIBUSB3380_GPEP_COUNT; ep_no++) { - usb3380_int_queue_deinit(&mgr->q_gpep_in[ep_no]); - usb3380_int_queue_deinit(&mgr->q_gpep_out[ep_no]); + for (unsigned idx = 0; idx < mgr->total_gpeps; idx++) { + usb3380_int_queue_gpep_deinit(&mgr->q_gpep[idx]); } + free(mgr->q_gpep); + free(mgr->gpep); free(mgr); return 0; @@ -1044,7 +1164,7 @@ if (written != 4 * data_size_dw) { LOG_ERR("Written %d != %d requested!", written, data_size_dw); - return -EIO; + return LIBUSB_ERROR_IO; } return 0; } @@ -1056,7 +1176,8 @@ uint32_t flags = CSR_BYTE_EN_ALL | PCIMSTCTL_CMD_CONFIG | PCIMSTCTL_MASTER_START | PCIMSTCTL_PCIE_READ | (1 << PCIMSTCTL_PCIE_DW_LEN_OFF_BITS); - return usb3380_int_pci_read(ctx, flags, addr, data, 1); + int res = usb3380_int_pci_read(ctx, flags, addr, data, 1); + return libusb_to_errno(res); } int usb3380_pci_cfg_write(libusb3380_context_t* ctx, uint32_t addr, @@ -1065,12 +1186,18 @@ uint32_t flags = CSR_BYTE_EN_ALL | PCIMSTCTL_CMD_CONFIG | PCIMSTCTL_MASTER_START | PCIMSTCTL_PCIE_WRITE | (1 << PCIMSTCTL_PCIE_DW_LEN_OFF_BITS); - return usb3380_int_pciout_sync(ctx, flags, addr, &data, 1); + int res = usb3380_int_pciout_sync(ctx, flags, addr, &data, 1); + return libusb_to_errno(res); } int usb3380_context_init(libusb3380_context_t** octx) { + return usb3380_context_init_ex(octx, NULL, NULL); +} + +int usb3380_context_init_ex(libusb3380_context_t** octx, libusb_device *dev, libusb_context *lctx) +{ int res; libusb3380_context_t* ctx; @@ -1079,14 +1206,28 @@ return -ENOMEM; memset(ctx, 0, sizeof(libusb3380_context_t)); - if (libusb_init(&ctx->context)) { - LOG_ERR("Unable to initialize LIBUSB"); - res = -EFAULT; - goto cleanup_mem; + ctx->context = lctx; + + if (lctx == NULL) { + if (libusb_init(&ctx->context)) { + LOG_ERR("Unable to initialize LIBUSB"); + res = -EFAULT; + goto cleanup_mem; + } + } + + if (dev == NULL) { + ctx->handle = libusb_open_device_with_vid_pid(ctx->context, + LIBUSB3380_VID, + LIBUSB3380_PID); + } else { + res = libusb_open(dev, &ctx->handle); + if (res) { + LOG_ERR("Unable to initialize DEVICE: %d", res); + goto cleanup_mem; + } } - ctx->handle = libusb_open_device_with_vid_pid(ctx->context, LIBUSB3380_VID, - LIBUSB3380_PID); if (ctx->handle == NULL) { LOG_ERR("Unable to open USB3380!"); res = -ENXIO; @@ -1211,6 +1352,17 @@ if (res) { return res; } + res = usb3380_csr_mm_cfg_write(ctx, DEVINIT, reg); + if (res) { + return res; + } + do { + res = usb3380_csr_mm_cfg_read(ctx, DEVINIT, &reg); + if (res) { + return res; + } + usleep(1000); + } while (reg & (1<<2)); #endif #if 0 for (int i = 1; i < 5; i++) { @@ -1285,24 +1437,22 @@ return res; } - /* 2M on BAR3, all quadrants to IN GPEP0 */ res = parse_bar_config(&cfg->bar2, &reg); if (res) { return res; } - res = usb3380_csr_mm_cfg_write(ctx, BAR3CTL, reg); + res = usb3380_csr_mm_cfg_write(ctx, BAR2CTL, reg); if (res) { return res; } - /* 2M on BAR2, all quadrants to OUT GPEP2 */ res = parse_bar_config(&cfg->bar3, &reg); if (res) { return res; } - res = usb3380_csr_mm_cfg_write(ctx, BAR2CTL, reg); + res = usb3380_csr_mm_cfg_write(ctx, BAR3CTL, reg); if (res) { return res; } @@ -1385,14 +1535,20 @@ if (res) { return res; } - +#if 0 // Include only GPEP0 in IN creadit calculation res = usb3380_csr_pcie_cfg_read(ctx, PCIE_PORT_USBC | 0x9f0, &reg); if (res) { return res; } LOG_DEBUG("INCH %8x", reg); - reg |= 0xe0000000; +#endif + // Enabgle credit calculation only for requested GPEPs + unsigned i; + for (reg = 0, i = 0; i < 4; i++) { + if (cfg->gpep_fifo_in_size[i] == 0) + reg |= (1U << (28 + i)); + } res = usb3380_csr_pcie_cfg_write(ctx, PCIE_PORT_USBC | 0x9f0, reg); if (res) { return res; @@ -1435,7 +1591,6 @@ // Check EP states const char* ep_names[6] = { "CSROUT", "CSRIN", "PCIOUT", "PCIIN", "STATIN", "RCIN" }; - unsigned i; for (i = 0; i < 6; i++) { res = usb3380_csr_mm_cfg_read(ctx, DEP_RSP + i * 0x10, &reg); if (res) { @@ -1508,27 +1663,34 @@ i_sz, i_st, i_st + i_sz); } - // Reconfigure GPEP0 & GPEP2 IN sizes to 4096 & 64 - res = usb3380_csr_mm_cfg_read(ctx, EP_FIFO_SIZE_BASE + EP_GPEP0_OFF, &reg); - if (res) { - return res; - } - reg = (0xffff & reg) | (6 << (16)) | (9 << (6+16)); - res = usb3380_csr_mm_cfg_write(ctx, EP_FIFO_SIZE_BASE + EP_GPEP0_OFF, reg); - if (res) { - return res; - } + const struct fifo_size_base { + uint16_t ep; uint8_t sz; uint16_t off; + } fifo_in_sz[] = { + { EP_EP0_OFF, EP_FIFO_512, 0 }, + { EP_GPEP0_OFF, EP_FIFO_4096, 0 + 8 + 1 }, + { EP_GPEP1_OFF, EP_FIFO_128, 0 + 8 + 1 + 64 + 1 }, + { EP_GPEP2_OFF, EP_FIFO_4096, 384 }, + { EP_GPEP3_OFF, EP_FIFO_128, 384 + 64 + 1 }, + { EP_PCIINOUT_OFF, EP_FIFO_256, 384 + 64 + 1 + 4 + 1 }, + { EP_RCIN_OFF, EP_FIFO_256, 384 + 64 + 1 + 4 + 1 + 4 + 1 }, + }; - res = usb3380_csr_mm_cfg_read(ctx, EP_FIFO_SIZE_BASE + EP_GPEP2_OFF, &reg); - if (res) { - return res; - } - reg = (0xffff & reg) | (0 << (16)) | (74 << (6+16)); - res = usb3380_csr_mm_cfg_write(ctx, EP_FIFO_SIZE_BASE + EP_GPEP2_OFF, reg); - if (res) { - return res; - } + for (i = 0; i < sizeof(fifo_in_sz) / sizeof(fifo_in_sz[0]); i++) { + if (fifo_in_sz[i].sz > EP_FIFO_4096) + continue; + + res = usb3380_csr_mm_cfg_read(ctx, EP_FIFO_SIZE_BASE + fifo_in_sz[i].ep, &reg); + if (res) { + return res; + } + // preserve OUT settings and override IN + reg = (0xffff & reg) | (fifo_in_sz[i].sz << (16)) | (fifo_in_sz[i].off << (6+16)); + res = usb3380_csr_mm_cfg_write(ctx, EP_FIFO_SIZE_BASE + fifo_in_sz[i].ep, reg); + if (res) { + return res; + } + } for (i = 1; i < 5; i++) { res = usb3380_csr_mm_cfg_read(ctx, EP_CFG + i * 0x20, &reg); @@ -1537,7 +1699,7 @@ } LOG_DEBUG("EP %9s: %08x", ep_sizes[i], reg); - reg |= 7U << 24; + reg |= 15U << 24; res = usb3380_csr_mm_cfg_write(ctx, EP_CFG + i * 0x20, reg); if (res) { @@ -1859,7 +2021,8 @@ uint32_t flags = CSR_BYTE_EN_ALL | PCIMSTCTL_CMD_MEMORY | PCIMSTCTL_MASTER_START | PCIMSTCTL_PCIE_READ | (1 << PCIMSTCTL_PCIE_DW_LEN_OFF_BITS); - return usb3380_int_pci_read(ctx, flags, addr, data, 1); + int res = usb3380_int_pci_read(ctx, flags, addr, data, 1); + return libusb_to_errno(res); } int usb3380_pci_dev_mem_read32_n(libusb3380_context_t* ctx, uint32_t addr, @@ -1868,7 +2031,8 @@ uint32_t flags = CSR_BYTE_EN_ALL | PCIMSTCTL_CMD_MEMORY | PCIMSTCTL_MASTER_START | PCIMSTCTL_PCIE_READ | (count_dw << PCIMSTCTL_PCIE_DW_LEN_OFF_BITS); - return usb3380_int_pci_read(ctx, flags, addr, data, count_dw); + int res = usb3380_int_pci_read(ctx, flags, addr, data, count_dw); + return libusb_to_errno(res); } int usb3380_pci_dev_mem_write32(libusb3380_context_t *ctx, uint32_t addr, @@ -1877,7 +2041,8 @@ uint32_t flags = CSR_BYTE_EN_ALL | PCIMSTCTL_CMD_MEMORY | PCIMSTCTL_MASTER_START | PCIMSTCTL_PCIE_WRITE | (1 << PCIMSTCTL_PCIE_DW_LEN_OFF_BITS); - return usb3380_int_pciout_sync(ctx, flags, addr, &data, 1); + int res = usb3380_int_pciout_sync(ctx, flags, addr, &data, 1); + return libusb_to_errno(res); } int usb3380_pci_dev_mem_write32_n(libusb3380_context_t* ctx, uint32_t addr, @@ -1886,7 +2051,8 @@ uint32_t flags = CSR_BYTE_EN_ALL | PCIMSTCTL_CMD_MEMORY | PCIMSTCTL_MASTER_START | PCIMSTCTL_PCIE_WRITE | (count_dw << PCIMSTCTL_PCIE_DW_LEN_OFF_BITS); - return usb3380_int_pciout_sync(ctx, flags, addr, data, count_dw); + int res = usb3380_int_pciout_sync(ctx, flags, addr, data, count_dw); + return libusb_to_errno(res); } int usb3380_pci_wait_interrupt(libusb3380_context_t *ctx, long timeoutms) @@ -1900,7 +2066,7 @@ if (res) { LOG_ERR("Unable to usb3380_int_rcin_sync! error=`%s` (%d)", libusb_error_name(res), res); - return res; + return libusb_to_errno(res); } LOG_DUMP("MSI %08x %08x %08x %08x", bufmsgs[0], bufmsgs[1], bufmsgs[2], bufmsgs[3]); @@ -1911,7 +2077,7 @@ res = usb3380_int_statin_sync(ctx, bufmsgs, 2, &written, timeoutms); if (res) { - return res; + return libusb_to_errno(res); } LOG_DUMP("STAT %08x %08x", bufmsgs[0], bufmsgs[1]); @@ -1930,7 +2096,7 @@ size, written, to); - return res; + return libusb_to_errno(res); } @@ -1944,6 +2110,49 @@ size, written, to); - return res; + return libusb_to_errno(res); } + +static LIBUSB_CALL void on_async_msi_cb(struct libusb_transfer *transfer) +{ + libusb3380_async_manager_t* mgr = (libusb3380_async_manager_t*)transfer->user_data; + int msi_num = -1; + + fill_base_in_cb(&mgr->msi.base, mgr->q_msi.transfer); + + if (mgr->msi.base.status == DQS_SUCCESS) { + msi_num = mgr->msi_data[3] - MSI_DEF_DATA; + + LOG_DUMP("on_async_msi_cb addr=%08x:%08x:%08x:%08x num=%d", + mgr->msi_data[0], mgr->msi_data[1], mgr->msi_data[2], + mgr->msi_data[3], msi_num); + + if (msi_num < 0 || msi_num > 31) { + msi_num = -1; + } + } + + mgr->msi_cb(mgr->msi_param, msi_num, mgr->msi.base.status == DQS_TIMEOUT); +} + + +int usb3380_msi_in_post(struct libusb3380_async_manager* mgr, + unsigned timeoutms, + on_msi_cb_t cb, + void* param) +{ + int res; + mgr->msi_cb = cb; + mgr->msi_param = param; + + prepare_ptransfer_rcin(mgr, on_async_msi_cb, timeoutms); + res = libusb_submit_transfer(mgr->q_msi.transfer); + + return libusb_to_errno(res); +} + +int usb3380_msi_in_cancel(struct libusb3380_async_manager* mgr) +{ + return libusb_to_errno(libusb_cancel_transfer(mgr->q_msi.transfer)); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/libusb3380.h new/libusb3380-0.0.0+git.20181025/libusb3380.h --- old/libusb3380-0.0.0+git.20171214/libusb3380.h 2017-12-14 17:04:58.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/libusb3380.h 2018-10-25 18:51:26.000000000 +0200 @@ -37,6 +37,7 @@ }; int usb3380_context_init(libusb3380_context_t** octx); +int usb3380_context_init_ex(libusb3380_context_t** octx, libusb_device *dev, libusb_context *ctx); void usb3380_context_free(libusb3380_context_t* ctx); @@ -48,7 +49,11 @@ USB3380_LOG_DUMP, } libusb3380_loglevel_t; -typedef void (*usb3380_logfunc_t)(libusb3380_loglevel_t lvl, void* obj, +typedef void (*usb3380_logfunc_t)(libusb3380_loglevel_t lvl, + void* obj, + const char* func, + const char* file, + int line, const char* message, ...); void usb3380_set_logfunc(usb3380_logfunc_t func, void *param); @@ -218,6 +223,7 @@ DQS_TIMEOUT = 1, DQS_ABORT = 2, DQS_PARTIAL = 3, + DQS_CANCELLED = 4, } libusb3380_status_t; @@ -261,7 +267,9 @@ struct libusb3380_qgpep; -typedef void (*on_gpep_cb_t)(const struct libusb3380_qgpep* gpep); +typedef void (*on_gpep_cb_t)(const struct libusb3380_qgpep* gpep, + unsigned gpepno, + unsigned idx); /* awaiting gpep data (device DMA in and out) */ typedef struct libusb3380_qgpep { @@ -280,9 +288,14 @@ libusb3380_as_base_t base; } libusb3380_qmsi_int_t; +typedef struct libusb3380_configuration { + unsigned gp_in_cnts[LIBUSB3380_GPEP_COUNT]; + unsigned gp_out_cnts[LIBUSB3380_GPEP_COUNT]; +} libusb3380_configuration_t; struct libusb3380_async_manager; int usb3380_async_start(struct libusb3380_pcidev *dev, + const struct libusb3380_configuration *configuration, struct libusb3380_async_manager** out); int usb3380_async_stop(struct libusb3380_async_manager* mgr); @@ -301,6 +314,7 @@ int usb3380_async_set_gpep_timeout(struct libusb3380_async_manager* mgr, bool ep_in, libusb3380_gpep_t gpep, + unsigned idx, unsigned to_ms); @@ -315,15 +329,31 @@ * full, otherwise it bolcks untill we get some space in the queue */ int usb3380_async_gpep_out_post(struct libusb3380_async_manager* mgr, - libusb3380_gpep_t ep_no, + libusb3380_gpep_t ep_no, unsigned idx, const uint8_t* data, unsigned size, on_gpep_cb_t cb, void* param); int usb3380_async_gpep_in_post(struct libusb3380_async_manager* mgr, - libusb3380_gpep_t ep_no, + libusb3380_gpep_t ep_no, unsigned idx, uint8_t* data, unsigned size, on_gpep_cb_t cb, void* param); +int usb3380_async_gpep_cancel(struct libusb3380_async_manager* mgr, + bool ep_in, + libusb3380_gpep_t ep_no, + unsigned idx); + + +typedef void (*on_msi_cb_t)(void* param, + int msinum, + bool timedout); + +int usb3380_msi_in_post(struct libusb3380_async_manager* mgr, + unsigned timeoutms, + on_msi_cb_t cb, + void* param); +int usb3380_msi_in_cancel(struct libusb3380_async_manager* mgr); + #ifdef __cplusplus }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/usb3380.h new/libusb3380-0.0.0+git.20181025/usb3380.h --- old/libusb3380-0.0.0+git.20171214/usb3380.h 2017-12-14 17:04:58.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/usb3380.h 2018-10-25 18:51:26.000000000 +0200 @@ -170,6 +170,8 @@ EP_GPEP1_OFF = 0x040, EP_GPEP2_OFF = 0x060, EP_GPEP3_OFF = 0x080, + EP_PCIINOUT_OFF = 0x0E0, + EP_RCIN_OFF = 0x100, EP_CFG = 0x300, EP_RSP = 0x304, @@ -178,6 +180,16 @@ EP_AVAIL = 0x310, }; +enum usb3380_ep_size { + EP_FIFO_64 = 0, + EP_FIFO_128 = 1, + EP_FIFO_256 = 2, + EP_FIFO_512 = 3, + EP_FIFO_1024 = 4, + EP_FIFO_2048 = 5, + EP_FIFO_4096 = 6, +}; + enum usb3380_pcictl_bits { PCIBAR0 = 0, PCIBAR1 = 1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libusb3380-0.0.0+git.20171214/xtrx_port.h new/libusb3380-0.0.0+git.20181025/xtrx_port.h --- old/libusb3380-0.0.0+git.20171214/xtrx_port.h 2017-12-14 17:04:58.000000000 +0100 +++ new/libusb3380-0.0.0+git.20181025/xtrx_port.h 2018-10-25 18:51:26.000000000 +0200 @@ -130,6 +130,10 @@ int sem_timedwait(sem_t *sem, const struct timespec *abs_timeout); +int sem_trywait(sem_t *sem); + +int sem_getvalue(sem_t *sem, int *sval); + /** @ingroup dynamic * Emulation of dl functions */ @@ -188,6 +192,7 @@ // TODO replace this constant #define ENAVAIL 1000 +#define ENOSTR 1001 #else #error Unknown platform

1 0

commit sysbench for openSUSE:Factory
by root 28 Dec '18

28 Dec '18

Hello community, here is the log from the commit of package sysbench for openSUSE:Factory checked in at 2018-12-28 12:36:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysbench (Old) and /work/SRC/openSUSE:Factory/.sysbench.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysbench" Fri Dec 28 12:36:04 2018 rev:21 rq:661728 version:1.0.16 Changes: -------- --- /work/SRC/openSUSE:Factory/sysbench/sysbench.changes 2018-10-31 13:21:51.647033837 +0100 +++ /work/SRC/openSUSE:Factory/.sysbench.new.28833/sysbench.changes 2018-12-28 12:36:08.631928973 +0100 @@ -1,0 +2,10 @@ +Fri Dec 28 04:46:21 UTC 2018 - sean(a)suspend.net + +- Update to version 1.0.16: + * SQL API: fix GH-282 (MySQL fetch_row() is broken) + * --rate mode: fix latency stats skew on low rates + * Lua: Add /usr/share/lua/5.1 to LUA_ATH and /usr/lib/lua/5.1 + * build/CI/packaging?: add -Wvla to default compiler flags + * build/CI/packaging: fix buildpack.sh to not push multiple file types + +------------------------------------------------------------------- Old: ---- sysbench-1.0.15.tar.gz New: ---- sysbench-1.0.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysbench.spec ++++++ --- /var/tmp/diff_new_pack.gRZRLq/_old 2018-12-28 12:36:08.983928727 +0100 +++ /var/tmp/diff_new_pack.gRZRLq/_new 2018-12-28 12:36:08.983928727 +0100 @@ -17,7 +17,7 @@ Name: sysbench -Version: 1.0.15 +Version: 1.0.16 Release: 0 Summary: A MySQL benchmarking tool License: GPL-2.0-only ++++++ sysbench-1.0.15.tar.gz -> sysbench-1.0.16.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.15/.travis.yml new/sysbench-1.0.16/.travis.yml --- old/sysbench-1.0.15/.travis.yml 2018-07-03 21:49:50.000000000 +0200 +++ new/sysbench-1.0.16/.travis.yml 2018-12-16 17:42:10.000000000 +0100 @@ -30,20 +30,20 @@ - TARGET=coverage - OS=el DIST=6 - OS=el DIST=7 - - OS=fedora DIST=27 - OS=fedora DIST=28 + - OS=fedora DIST=29 - OS=fedora DIST=rawhide - OS=ubuntu DIST=trusty - OS=ubuntu DIST=xenial - - OS=ubuntu DIST=artful - OS=ubuntu DIST=bionic + - OS=ubuntu DIST=cosmic - OS=debian DIST=jessie - OS=debian DIST=stretch - OS=debian DIST=sid - OS=ubuntu DIST=trusty ARCH=i386 - OS=ubuntu DIST=xenial ARCH=i386 - - OS=ubuntu DIST=artful ARCH=i386 - OS=ubuntu DIST=bionic ARCH=i386 + - OS=ubuntu DIST=cosmic ARCH=i386 - OS=debian DIST=jessie ARCH=i386 - OS=debian DIST=stretch ARCH=i386 - OS=debian DIST=sid ARCH=i386 @@ -54,20 +54,20 @@ compiler: clang - env: OS=el DIST=7 compiler: clang - - env: OS=fedora DIST=27 - compiler: clang - env: OS=fedora DIST=28 compiler: clang + - env: OS=fedora DIST=29 + compiler: clang - env: OS=fedora DIST=rawhide compiler: clang - env: OS=ubuntu DIST=trusty compiler: clang - env: OS=ubuntu DIST=xenial compiler: clang - - env: OS=ubuntu DIST=artful - compiler: clang - env: OS=ubuntu DIST=bionic compiler: clang + - env: OS=ubuntu DIST=cosmic + compiler: clang - env: OS=debian DIST=jessie compiler: clang - env: OS=debian DIST=stretch @@ -78,10 +78,10 @@ compiler: clang - env: OS=ubuntu DIST=xenial ARCH=i386 compiler: clang - - env: OS=ubuntu DIST=artful ARCH=i386 - compiler: clang - env: OS=ubuntu DIST=bionic ARCH=i386 compiler: clang + - env: OS=ubuntu DIST=cosmic ARCH=i386 + compiler: clang - env: OS=debian DIST=jessie ARCH=i386 compiler: clang - env: OS=debian DIST=stretch ARCH=i386 @@ -92,20 +92,20 @@ os: osx - env: OS=el DIST=7 os: osx - - env: OS=fedora DIST=27 - os: osx - env: OS=fedora DIST=28 os: osx + - env: OS=fedora DIST=29 + os: osx - env: OS=fedora DIST=rawhide os: osx - env: OS=ubuntu DIST=trusty os: osx - env: OS=ubuntu DIST=xenial os: osx - - env: OS=ubuntu DIST=artful - os: osx - env: OS=ubuntu DIST=bionic os: osx + - env: OS=ubuntu DIST=cosmic + os: osx - env: OS=debian DIST=jessie os: osx - env: OS=debian DIST=stretch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.15/ChangeLog new/sysbench-1.0.16/ChangeLog --- old/sysbench-1.0.15/ChangeLog 2018-07-03 21:49:50.000000000 +0200 +++ new/sysbench-1.0.16/ChangeLog 2018-12-16 17:42:10.000000000 +0100 @@ -1,3 +1,20 @@ +2018-12-16 Alexey Kopytov <akopytov(a)gmail.com> + + * version 1.0.16 + * build/CI/packaging: add Ubuntu Cosmic. + * build/CI/packaging: add Fedora 29. + * build/CI/packaging: remove Fedora 27 (EOL). + * SQL API: fix GH-282 (Mysql's fetch_row() is broken) + * --rate mode: fix latency stats skew on low rates + * Lua: Add /usr/share/lua/5.1 to LUA_PATH and /usr/lib/lua/5.1 + to LUA_CPATH. + * build/CI/packaging: add -Wvla to default compiler flags. + * build/CI/packaging: fix debian/changelog format + * build/CI/packaging: fix buildpack.sh to not push multiple file + types to packagecloud. + * build/CI/packaging: add libaio-dev to Debian/Ubuntu build + dependencies. + 2018-07-03 Alexey Kopytov <akopytov(a)gmail.com> * version 1.0.15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.15/configure.ac new/sysbench-1.0.16/configure.ac --- old/sysbench-1.0.15/configure.ac 2018-07-03 21:49:50.000000000 +0200 +++ new/sysbench-1.0.16/configure.ac 2018-12-16 17:42:10.000000000 +0100 @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.63) -AC_INIT([sysbench],[1.0.15],[https://github.com/akopytov/sysbench/issues], +AC_INIT([sysbench],[1.0.16],[https://github.com/akopytov/sysbench/issues], [sysbench], [https://github.com/akopytov/sysbench]) AC_CONFIG_AUX_DIR([config]) @@ -443,7 +443,7 @@ CC_WARNINGS="-Wall -Wextra -Wpointer-arith -Wbad-function-cast \ -Wstrict-prototypes -Wnested-externs -Wno-format-zero-length \ -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \ --Wredundant-decls -Wcast-align ${W_FAIL}" +-Wredundant-decls -Wcast-align -Wvla ${W_FAIL}" fi if test "$ax_cv_c_compiler_vendor" = "sun" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.15/debian/changelog new/sysbench-1.0.16/debian/changelog --- old/sysbench-1.0.15/debian/changelog 2018-07-03 21:49:50.000000000 +0200 +++ new/sysbench-1.0.16/debian/changelog 2018-12-16 17:42:10.000000000 +0100 @@ -1,3 +1,9 @@ +sysbench (1.0.15-2) unstable; urgency=low + + * add libaio-dev to build dependencies + + -- Alexey Kopytov <akopytov(a)gmail.com> Sat, 09 Jul 2018 09:24:42 +0300 + sysbench (1.0.12-1) unstable; urgency=low * remove vim-common from build dependencies diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.15/debian/control new/sysbench-1.0.16/debian/control --- old/sysbench-1.0.15/debian/control 2018-07-03 21:49:50.000000000 +0200 +++ new/sysbench-1.0.16/debian/control 2018-12-16 17:42:10.000000000 +0100 @@ -2,7 +2,7 @@ Section: misc Priority: extra Maintainer: Alexey Kopytov <akopytov(a)gmail.com> -Build-Depends: debhelper, autoconf, automake, libtool, libmysqlclient-dev | default-libmysqlclient-dev, libpq-dev, pkg-config, python +Build-Depends: debhelper, autoconf, automake, libaio-dev, libtool, libmysqlclient-dev | default-libmysqlclient-dev, libpq-dev, pkg-config, python Standards-Version: 3.9.5 Homepage: https://github.com/akopytov/sysbench diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.15/scripts/buildpack.sh new/sysbench-1.0.16/scripts/buildpack.sh --- old/sysbench-1.0.15/scripts/buildpack.sh 2018-07-03 21:49:50.000000000 +0200 +++ new/sysbench-1.0.16/scripts/buildpack.sh 2018-12-16 17:42:10.000000000 +0100 @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# Build packages for a specified architecture and upload them packagecloud.io +# Build packages for a specified architecture and upload them to packagecloud.io # Expects the following environment variables to be defined: # # ARCH - architecture. 'aarch64', 'x86_64 and 'i386' are currently supported @@ -49,12 +49,12 @@ distros_x86_64=( "el 6 x86_64" "el 7 x86_64" - "fedora 27 x86_64" "fedora 28 x86_64" + "fedora 29 x86_64" "ubuntu trusty x86_64" "ubuntu xenial x86_64" - "ubuntu artful x86_64" "ubuntu bionic x86_64" + "ubuntu cosmic x86_64" "debian jessie x86_64" "debian stretch x86_64" ) @@ -62,18 +62,18 @@ distros_i386=( "ubuntu trusty i386" "ubuntu xenial i386" - "ubuntu artful i386" "ubuntu bionic i386" + "ubuntu cosmic i386" "debian jessie i386" "debian stretch i386" ) distros_aarch64=( "el 7 aarch64" - "fedora 27 aarch64" "fedora 28 aarch64" - "ubuntu artful aarch64" + "fedora 29 aarch64" "ubuntu bionic aarch64" + "ubuntu cosmic aarch64" "ubuntu trusty aarch64" "ubuntu xenial aarch64" "debian jessie aarch64" @@ -178,9 +178,12 @@ echo "Pushing packages to ${PACKAGECLOUD_USER}/${PACKAGECLOUD_REPO}" - package_cloud push ${PACKAGECLOUD_EXTRA_ARGS} \ - ${PACKAGECLOUD_USER}/${PACKAGECLOUD_REPO}/${OS}/${DIST} \ - $files + for f in $files ; do + echo $f + package_cloud push ${PACKAGECLOUD_EXTRA_ARGS} \ + ${PACKAGECLOUD_USER}/${PACKAGECLOUD_REPO}/${OS}/${DIST} \ + $f + done OS=${PPOS} packpack/packpack clean done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.15/src/drivers/mysql/drv_mysql.c new/sysbench-1.0.16/src/drivers/mysql/drv_mysql.c --- old/sysbench-1.0.15/src/drivers/mysql/drv_mysql.c 2018-07-03 21:49:50.000000000 +0200 +++ new/sysbench-1.0.16/src/drivers/mysql/drv_mysql.c 2018-12-16 17:42:10.000000000 +0100 @@ -969,8 +969,10 @@ DEBUG("mysql_fetch_row(%p) = %p", rs->ptr, my_row); unsigned long *lengths = mysql_fetch_lengths(rs->ptr); + DEBUG("mysql_fetch_lengths(%p) = %p", rs->ptr, lengths); + if (lengths == NULL) - return DB_ERROR_NONE; + return DB_ERROR_IGNORABLE; for (size_t i = 0; i < rs->nfields; i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.15/src/drivers/pgsql/drv_pgsql.c new/sysbench-1.0.16/src/drivers/pgsql/drv_pgsql.c --- old/sysbench-1.0.15/src/drivers/pgsql/drv_pgsql.c 2018-07-03 21:49:50.000000000 +0200 +++ new/sysbench-1.0.16/src/drivers/pgsql/drv_pgsql.c 2018-12-16 17:42:10.000000000 +0100 @@ -721,7 +721,7 @@ */ rownum = (intptr_t) row->ptr; if (rownum >= (int) rs->nrows) - return DB_ERROR_NONE; + return DB_ERROR_IGNORABLE; for (i = 0; i < (int) rs->nfields; i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.15/src/sb_lua.c new/sysbench-1.0.16/src/sb_lua.c --- old/sysbench-1.0.15/src/sb_lua.c 2018-07-03 21:49:50.000000000 +0200 +++ new/sysbench-1.0.16/src/sb_lua.c 2018-12-16 17:42:10.000000000 +0100 @@ -592,7 +592,7 @@ } lua_pushliteral(L, "/usr/local/share/lua/5.1/?.lua;"); - + lua_pushliteral(L, "/usr/share/lua/5.1/?.lua;"); lua_pushliteral(L, DATADIR "/?.lua;"); lua_concat(L, lua_gettop(L) - top); @@ -618,8 +618,9 @@ } lua_pushliteral(L, "/usr/local/lib/lua/5.1/?" DLEXT ";"); - + lua_pushliteral(L, "/usr/lib/lua/5.1/?" DLEXT ";"); lua_pushliteral(L, LIBDIR ";"); + lua_concat(L, lua_gettop(L) - top); /* Mimic the default Lua behavior with respect to LUA_CPATH and ';;' */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.15/src/sysbench.c new/sysbench-1.0.16/src/sysbench.c --- old/sysbench-1.0.15/src/sysbench.c 2018-07-03 21:49:50.000000000 +0200 +++ new/sysbench-1.0.16/src/sysbench.c 2018-12-16 17:42:10.000000000 +0100 @@ -134,6 +134,8 @@ static sb_barrier_t thread_start_barrier; /* structures to handle queue of events, needed for tx_rate mode */ +static pthread_mutex_t queue_mutex; +static pthread_cond_t queue_cond; static uint64_t queue_array[MAX_QUEUE_LEN] CK_CC_CACHELINE; static ck_ring_buffer_t queue_ring_buffer[MAX_QUEUE_LEN] CK_CC_CACHELINE; static ck_ring_t queue_ring CK_CC_CACHELINE; @@ -709,7 +711,23 @@ while (!ck_ring_dequeue_spmc(&queue_ring, queue_ring_buffer, &ptr) && !ck_pr_load_int(&queue_is_full)) - usleep(500000.0 * sb_globals.threads / sb_globals.tx_rate); + { + pthread_mutex_lock(&queue_mutex); + pthread_cond_wait(&queue_cond, &queue_mutex); + pthread_mutex_unlock(&queue_mutex); + + /* Re-check for global error and time limit after waiting */ + + if (sb_globals.error) + return false; + + if (sb_globals.max_time_ns > 0 && + SB_UNLIKELY(sb_timer_value(&sb_exec_timer) >= sb_globals.max_time_ns)) + { + log_text(LOG_INFO, "Time limit exceeded, exiting..."); + return false; + } + } if (ck_pr_load_int(&queue_is_full)) { @@ -835,13 +853,11 @@ static inline double sb_rand_exp(double lambda) { - return -1.0 / lambda * log(1 - sb_rand_uniform_double()); + return -lambda * log(1 - sb_rand_uniform_double()); } static void *eventgen_thread_proc(void *arg) { - int i; - (void)arg; /* unused */ sb_tls_thread_id = SB_BACKGROUND_THREAD_ID; @@ -851,7 +867,12 @@ ck_ring_init(&queue_ring, MAX_QUEUE_LEN); - i = 0; + if (pthread_mutex_init(&queue_mutex, NULL) || + pthread_cond_init(&queue_cond, NULL)) + { + sb_barrier_wait(&thread_start_barrier); + return NULL; + } log_text(LOG_DEBUG, "Event generating thread started"); @@ -865,24 +886,33 @@ Get exponentially distributed time intervals in nanoseconds with Lambda = tx_rate. Alternatively, we can use Lambda = tx_rate / 1e9 */ - double lambda = sb_globals.tx_rate / 1e9; + const double lambda = 1e9 / sb_globals.tx_rate; + uint64_t curr_ns = sb_timer_value(&sb_exec_timer); uint64_t intr_ns = sb_rand_exp(lambda); - uint64_t next_ns = curr_ns + intr_ns;; + uint64_t next_ns = curr_ns + intr_ns; - for (;;) + for (int i = 0; ; i = (i+1) % MAX_QUEUE_LEN) { curr_ns = sb_timer_value(&sb_exec_timer); intr_ns = sb_rand_exp(lambda); next_ns += intr_ns; + if (sb_globals.max_time_ns > 0 && + SB_UNLIKELY(curr_ns >= sb_globals.max_time_ns)) + { + /* Wake all waiting threads */ + pthread_cond_broadcast(&queue_cond); + return NULL; + } + if (next_ns > curr_ns) sb_nanosleep(next_ns - curr_ns); /* Enqueue a new event */ queue_array[i] = sb_timer_value(&sb_exec_timer); if (ck_ring_enqueue_spmc(&queue_ring, queue_ring_buffer, - &queue_array[i++]) == false) + &queue_array[i]) == false) { ck_pr_store_int(&queue_is_full, 1); log_text(LOG_FATAL, @@ -891,8 +921,8 @@ return NULL; } - if (i >= MAX_QUEUE_LEN - 1) - i = 0; + /* Wake up one waiting thread, if there are any */ + pthread_cond_signal(&queue_cond); } return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.15/tests/include/api_sql_common.sh new/sysbench-1.0.16/tests/include/api_sql_common.sh --- old/sysbench-1.0.15/tests/include/api_sql_common.sh 2018-07-03 21:49:50.000000000 +0200 +++ new/sysbench-1.0.16/tests/include/api_sql_common.sh 2018-12-16 17:42:10.000000000 +0100 @@ -181,9 +181,11 @@ sysbench $SB_ARGS run +cat <<EOF ######################################################################## # Multiple connections test ######################################################################## +EOF cat >$CRAMTMP/api_sql.lua <<EOF function thread_init() drv = sysbench.sql.driver() @@ -209,9 +211,11 @@ sysbench $SB_ARGS run +cat <<EOF ######################################################################## # Incorrect bulk API usage ######################################################################## +EOF cat >$CRAMTMP/api_sql.lua <<EOF c = sysbench.sql.driver():connect() c:query("CREATE TABLE t1(a INT)") @@ -226,9 +230,11 @@ sysbench $SB_ARGS +cat <<EOF ######################################################################## # query_row() with an empty result set ######################################################################## +EOF cat >$CRAMTMP/api_sql.lua <<EOF c = sysbench.sql.driver():connect() c:query("CREATE TABLE t1(a INT)") @@ -237,3 +243,21 @@ EOF sysbench $SB_ARGS + +cat <<EOF +######################################################################## +# GH-282: Mysql's fetch_row() is broken +######################################################################## +EOF +cat >$CRAMTMP/api_sql.lua <<EOF +connection = sysbench.sql.driver():connect() +rows = connection:query("select 1 union select 2") + +r = rows:fetch_row(); +while ( r ) do + print( r[ 1 ] ) + r = rows:fetch_row() +end +EOF + +sysbench $SB_ARGS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.15/tests/t/api_sql_mysql.t new/sysbench-1.0.16/tests/t/api_sql_mysql.t --- old/sysbench-1.0.15/tests/t/api_sql_mysql.t 2018-07-03 21:49:50.000000000 +0200 +++ new/sysbench-1.0.16/tests/t/api_sql_mysql.t 2018-12-16 17:42:10.000000000 +0100 @@ -102,6 +102,9 @@ } */api_sql.lua:*: SQL error, errno = 1051, state = '42S02': Unknown table '*t' (glob) -- + ######################################################################## + # Multiple connections test + ######################################################################## 1 2 3 @@ -112,6 +115,17 @@ 8 9 10 + ######################################################################## + # Incorrect bulk API usage + ######################################################################## ALERT: attempt to call bulk_insert_next() before bulk_insert_init() */api_sql.lua:*: db_bulk_insert_next() failed (glob) + ######################################################################## + # query_row() with an empty result set + ######################################################################## nil + ######################################################################## + # GH-282: Mysql's fetch_row() is broken + ######################################################################## + 1 + 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.15/tests/t/api_sql_pgsql.t new/sysbench-1.0.16/tests/t/api_sql_pgsql.t --- old/sysbench-1.0.15/tests/t/api_sql_pgsql.t 2018-07-03 21:49:50.000000000 +0200 +++ new/sysbench-1.0.16/tests/t/api_sql_pgsql.t 2018-12-16 17:42:10.000000000 +0100 @@ -108,6 +108,9 @@ } */api_sql.lua:*: SQL error, errno = 0, state = '42P01': table "t" does not exist (glob) -- + ######################################################################## + # Multiple connections test + ######################################################################## 1 2 3 @@ -118,6 +121,17 @@ 8 9 10 + ######################################################################## + # Incorrect bulk API usage + ######################################################################## ALERT: attempt to call bulk_insert_next() before bulk_insert_init() */api_sql.lua:*: db_bulk_insert_next() failed (glob) + ######################################################################## + # query_row() with an empty result set + ######################################################################## nil + ######################################################################## + # GH-282: Mysql's fetch_row() is broken + ######################################################################## + 1 + 2

1 0

commit mint-themes for openSUSE:Factory
by root 28 Dec '18

28 Dec '18

Hello community, here is the log from the commit of package mint-themes for openSUSE:Factory checked in at 2018-12-28 12:36:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mint-themes (Old) and /work/SRC/openSUSE:Factory/.mint-themes.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mint-themes" Fri Dec 28 12:36:02 2018 rev:13 rq:661678 version:1.7.8 Changes: -------- --- /work/SRC/openSUSE:Factory/mint-themes/mint-themes.changes 2018-12-18 14:58:10.510271014 +0100 +++ /work/SRC/openSUSE:Factory/.mint-themes.new.28833/mint-themes.changes 2018-12-28 12:36:06.311930598 +0100 @@ -1,0 +2,9 @@ +Wed Dec 26 23:25:34 UTC 2018 - sor.alexei(a)meowr.ru + +- Update to version 1.7.8: + * Mint-themes: Fix expo workspace entry not expanding to fit + scaled fonts. + * Mint-X & Mint-Y: Fix Attached Dialogue Titlebar. + * Mint-Y-Grey*: Fix red GTK+2 menubar bg. + +------------------------------------------------------------------- Old: ---- mint-themes_1.7.6.tar.xz New: ---- mint-themes_1.7.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mint-themes.spec ++++++ --- /var/tmp/diff_new_pack.9HI0C0/_old 2018-12-28 12:36:06.935930161 +0100 +++ /var/tmp/diff_new_pack.9HI0C0/_new 2018-12-28 12:36:06.939930159 +0100 @@ -18,7 +18,7 @@ %define _name mint Name: mint-themes -Version: 1.7.6 +Version: 1.7.8 Release: 0 Summary: Mint Themes License: GPL-3.0-or-later ++++++ mint-themes_1.7.6.tar.xz -> mint-themes_1.7.8.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mint-themes/debian/changelog new/mint-themes/debian/changelog --- old/mint-themes/debian/changelog 2018-12-12 14:16:11.000000000 +0100 +++ new/mint-themes/debian/changelog 2018-12-17 13:24:38.000000000 +0100 @@ -1,3 +1,17 @@ +mint-themes (1.7.8) tessa; urgency=medium + + * Mint-Y-Grey*: Fix red GTK2 menubar bg + + -- Clement Lefebvre <root(a)linuxmint.com> Mon, 17 Dec 2018 12:24:38 +0000 + +mint-themes (1.7.7) tessa; urgency=medium + + [ Steve M ] + * Mint-themes fix expo workspace entry not expanding to fit scaled fonts (#175) + * Mint-Y & Mint-X Fix Attached Dialog Titlebar (#174) + + -- Clement Lefebvre <root(a)linuxmint.com> Sat, 15 Dec 2018 12:13:23 +0000 + mint-themes (1.7.6) tessa; urgency=medium * Cinnamon: Increase padding and center align text in applets diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/mint-themes/files/usr/share/themes/Linux Mint/cinnamon/cinnamon.css" "new/mint-themes/files/usr/share/themes/Linux Mint/cinnamon/cinnamon.css" --- "old/mint-themes/files/usr/share/themes/Linux Mint/cinnamon/cinnamon.css" 2018-11-15 10:39:21.000000000 +0100 +++ "new/mint-themes/files/usr/share/themes/Linux Mint/cinnamon/cinnamon.css" 2018-12-15 13:13:20.000000000 +0100 @@ -1902,7 +1902,7 @@ caret-color: rgb(128, 128, 128); caret-size: 1px; width: 250px; - height: 15px; + height: 1.5em; box-shadow: inset 0px 2px 4px rgba(0, 0, 0, 0.6); text-align: center; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mint-themes/files/usr/share/themes/Mint-X/metacity-1/metacity-theme-3.xml new/mint-themes/files/usr/share/themes/Mint-X/metacity-1/metacity-theme-3.xml --- old/mint-themes/files/usr/share/themes/Mint-X/metacity-1/metacity-theme-3.xml 2018-10-23 11:49:13.000000000 +0200 +++ new/mint-themes/files/usr/share/themes/Mint-X/metacity-1/metacity-theme-3.xml 2018-12-15 13:13:20.000000000 +0100 @@ -86,10 +86,6 @@ </frame_geometry> <frame_geometry name="attached" title_scale="medium" hide_buttons="true" rounded_top_left="4" rounded_top_right="4" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal"> - <distance name="title_vertical_pad" value="0"/> - <distance name="bottom_height" value="3"/> - <distance name="left_width" value="3"/> - <distance name="right_width" value="3"/> </frame_geometry>  @@ -546,6 +542,10 @@ </frame_style> <frame_style name="attached_unfocused" geometry="attached"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="rounded_border_unfocused" /> <button function="close" state="normal"><draw_ops></draw_ops></button> <button function="close" state="pressed"><draw_ops></draw_ops></button> <button function="maximize" state="normal"><draw_ops></draw_ops></button> @@ -569,6 +569,10 @@ </frame_style> <frame_style name="attached_focused" geometry="attached"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="rounded_border_focused" /> <button function="close" state="normal"><draw_ops></draw_ops></button> <button function="close" state="pressed"><draw_ops></draw_ops></button> <button function="maximize" state="normal"><draw_ops></draw_ops></button> Binary files old/mint-themes/files/usr/share/themes/Mint-Y-Dark-Grey/gtk-2.0/menubar-toolbar/menubar_button-dark.png and new/mint-themes/files/usr/share/themes/Mint-Y-Dark-Grey/gtk-2.0/menubar-toolbar/menubar_button-dark.png differ Binary files old/mint-themes/files/usr/share/themes/Mint-Y-Dark-Grey/gtk-2.0/menubar-toolbar/menubar_button.png and new/mint-themes/files/usr/share/themes/Mint-Y-Dark-Grey/gtk-2.0/menubar-toolbar/menubar_button.png differ Binary files old/mint-themes/files/usr/share/themes/Mint-Y-Dark-Grey/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png and new/mint-themes/files/usr/share/themes/Mint-Y-Dark-Grey/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png differ Binary files old/mint-themes/files/usr/share/themes/Mint-Y-Dark-Grey/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png and new/mint-themes/files/usr/share/themes/Mint-Y-Dark-Grey/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png differ Binary files old/mint-themes/files/usr/share/themes/Mint-Y-Darker-Grey/gtk-2.0/menubar-toolbar/menubar_button-dark.png and new/mint-themes/files/usr/share/themes/Mint-Y-Darker-Grey/gtk-2.0/menubar-toolbar/menubar_button-dark.png differ Binary files old/mint-themes/files/usr/share/themes/Mint-Y-Darker-Grey/gtk-2.0/menubar-toolbar/menubar_button.png and new/mint-themes/files/usr/share/themes/Mint-Y-Darker-Grey/gtk-2.0/menubar-toolbar/menubar_button.png differ Binary files old/mint-themes/files/usr/share/themes/Mint-Y-Darker-Grey/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png and new/mint-themes/files/usr/share/themes/Mint-Y-Darker-Grey/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png differ Binary files old/mint-themes/files/usr/share/themes/Mint-Y-Darker-Grey/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png and new/mint-themes/files/usr/share/themes/Mint-Y-Darker-Grey/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png differ Binary files old/mint-themes/files/usr/share/themes/Mint-Y-Grey/gtk-2.0/menubar-toolbar/menubar_button-dark.png and new/mint-themes/files/usr/share/themes/Mint-Y-Grey/gtk-2.0/menubar-toolbar/menubar_button-dark.png differ Binary files old/mint-themes/files/usr/share/themes/Mint-Y-Grey/gtk-2.0/menubar-toolbar/menubar_button.png and new/mint-themes/files/usr/share/themes/Mint-Y-Grey/gtk-2.0/menubar-toolbar/menubar_button.png differ Binary files old/mint-themes/files/usr/share/themes/Mint-Y-Grey/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png and new/mint-themes/files/usr/share/themes/Mint-Y-Grey/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png differ Binary files old/mint-themes/files/usr/share/themes/Mint-Y-Grey/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png and new/mint-themes/files/usr/share/themes/Mint-Y-Grey/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mint-themes/src/Mint-X/theme/Mint-X/cinnamon/cinnamon.css new/mint-themes/src/Mint-X/theme/Mint-X/cinnamon/cinnamon.css --- old/mint-themes/src/Mint-X/theme/Mint-X/cinnamon/cinnamon.css 2018-12-12 13:34:01.000000000 +0100 +++ new/mint-themes/src/Mint-X/theme/Mint-X/cinnamon/cinnamon.css 2018-12-15 13:13:20.000000000 +0100 @@ -1905,7 +1905,7 @@ border-image: url("misc-assets/expo-name-entry.png") 6; padding: 8px 12px; border-radius: 2px; - height: 15px; + height: 1.5em; color: rgba(255, 255, 255, 0.7); text-align: center; font-weight: bold; Binary files old/mint-themes/src/Mint-Y/cinnamon/.sass-cache/28d2ccc3a58a7337a2440e61a90993837cbd499b/_common.scssc and new/mint-themes/src/Mint-Y/cinnamon/.sass-cache/28d2ccc3a58a7337a2440e61a90993837cbd499b/_common.scssc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mint-themes/src/Mint-Y/cinnamon/sass/_common.scss new/mint-themes/src/Mint-Y/cinnamon/sass/_common.scss --- old/mint-themes/src/Mint-Y/cinnamon/sass/_common.scss 2018-12-12 13:33:33.000000000 +0100 +++ new/mint-themes/src/Mint-Y/cinnamon/sass/_common.scss 2018-12-15 13:13:20.000000000 +0100 @@ -619,7 +619,7 @@ .expo-workspaces-name-entry, .expo-workspaces-name-entry#selected { - height: 15px; + height: 1.5em; border-radius: 2px; font-size: 9pt; padding: 5px 8px; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mint-themes/src/Mint-Y/metacity-1/metacity-theme-3-dark.xml new/mint-themes/src/Mint-Y/metacity-1/metacity-theme-3-dark.xml --- old/mint-themes/src/Mint-Y/metacity-1/metacity-theme-3-dark.xml 2018-11-07 11:28:34.000000000 +0100 +++ new/mint-themes/src/Mint-Y/metacity-1/metacity-theme-3-dark.xml 2018-12-15 13:13:20.000000000 +0100 @@ -112,12 +112,8 @@ <distance name="title_vertical_pad" value="5"/> </frame_geometry> - -<frame_geometry name="attached" title_scale="small" has_title="false" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" rounded_bottom_left="0" rounded_bottom_right="0" parent="normal"> - <distance name="title_vertical_pad" value="0"/> - <distance name="bottom_height" value="1"/> - <distance name="left_width" value="1"/> - <distance name="right_width" value="1"/> +<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small"> + <distance name="title_vertical_pad" value="5"/> </frame_geometry>  @@ -931,6 +927,7 @@ <frame_style name="attached_focused" geometry="attached"> <piece position="entire_background" draw_ops="entire_background_focused" /> <piece position="titlebar" draw_ops="titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> <button function="close" state="normal"><draw_ops></draw_ops></button> <button function="close" state="pressed"><draw_ops></draw_ops></button> <button function="maximize" state="normal"><draw_ops></draw_ops></button> @@ -956,6 +953,7 @@ <frame_style name="attached_unfocused" geometry="attached"> <piece position="entire_background" draw_ops="entire_background_unfocused" /> <piece position="titlebar" draw_ops="titlebar_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> <button function="close" state="normal"><draw_ops></draw_ops></button> <button function="close" state="pressed"><draw_ops></draw_ops></button> <button function="maximize" state="normal"><draw_ops></draw_ops></button> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mint-themes/src/Mint-Y/metacity-1/metacity-theme-3.xml new/mint-themes/src/Mint-Y/metacity-1/metacity-theme-3.xml --- old/mint-themes/src/Mint-Y/metacity-1/metacity-theme-3.xml 2018-11-08 13:00:04.000000000 +0100 +++ new/mint-themes/src/Mint-Y/metacity-1/metacity-theme-3.xml 2018-12-15 13:13:20.000000000 +0100 @@ -112,12 +112,8 @@ <distance name="title_vertical_pad" value="5"/> </frame_geometry> - -<frame_geometry name="attached" title_scale="small" has_title="false" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" rounded_bottom_left="0" rounded_bottom_right="0" parent="normal"> - <distance name="title_vertical_pad" value="0"/> - <distance name="bottom_height" value="1"/> - <distance name="left_width" value="1"/> - <distance name="right_width" value="1"/> +<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small"> + <distance name="title_vertical_pad" value="5"/> </frame_geometry>  @@ -941,6 +937,7 @@ <frame_style name="attached_focused" geometry="attached"> <piece position="entire_background" draw_ops="entire_background_focused" /> <piece position="titlebar" draw_ops="titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> <button function="close" state="normal"><draw_ops></draw_ops></button> <button function="close" state="pressed"><draw_ops></draw_ops></button> <button function="maximize" state="normal"><draw_ops></draw_ops></button> @@ -966,6 +963,7 @@ <frame_style name="attached_unfocused" geometry="attached"> <piece position="entire_background" draw_ops="entire_background_unfocused" /> <piece position="titlebar" draw_ops="titlebar_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> <button function="close" state="normal"><draw_ops></draw_ops></button> <button function="close" state="pressed"><draw_ops></draw_ops></button> <button function="maximize" state="normal"><draw_ops></draw_ops></button>

1 0

commit python-caja for openSUSE:Factory
by root 28 Dec '18

28 Dec '18

Hello community, here is the log from the commit of package python-caja for openSUSE:Factory checked in at 2018-12-28 12:36:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-caja (Old) and /work/SRC/openSUSE:Factory/.python-caja.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-caja" Fri Dec 28 12:36:01 2018 rev:14 rq:661677 version:1.20.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-caja/python-caja.changes 2018-06-29 22:32:37.850198056 +0200 +++ /work/SRC/openSUSE:Factory/.python-caja.new.28833/python-caja.changes 2018-12-28 12:36:05.751930991 +0100 @@ -1,0 +2,7 @@ +Wed Dec 26 23:25:34 UTC 2018 - sor.alexei(a)meowr.ru + +- Update to version 1.20.2: + * Disable deprecation warnings for distcheck. + * Update translations. + +------------------------------------------------------------------- Old: ---- python-caja-1.20.1.tar.xz New: ---- python-caja-1.20.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-caja.spec ++++++ --- /var/tmp/diff_new_pack.vblOa2/_old 2018-12-28 12:36:06.079930761 +0100 +++ /var/tmp/diff_new_pack.vblOa2/_new 2018-12-28 12:36:06.079930761 +0100 @@ -12,20 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define _name caja-python %define _version 1.20 Name: python-caja -Version: 1.20.1 +Version: 1.20.2 Release: 0 Summary: Python bindings for Caja License: GPL-2.0-or-later Group: System/GUI/Other Url: https://mate-desktop.org/ -Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz +Source: https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz BuildRequires: mate-common >= %{_version} BuildRequires: pkgconfig BuildRequires: pkgconfig(libcaja-extension) >= %{_version} @@ -112,11 +112,10 @@ %if 0%{?suse_version} >= 1500 %files -n python2-caja -%license COPYING %else %files -%doc COPYING %endif +%license COPYING %doc AUTHORS NEWS README %doc %{_docdir}/%{name}/ %{_libdir}/caja/extensions-2.0/lib%{_name}.so ++++++ python-caja-1.20.1.tar.xz -> python-caja-1.20.2.tar.xz ++++++ ++++ 1803 lines of diff (skipped)

1 0

commit pluma for openSUSE:Factory
by root 28 Dec '18

28 Dec '18

Hello community, here is the log from the commit of package pluma for openSUSE:Factory checked in at 2018-12-28 12:35:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pluma (Old) and /work/SRC/openSUSE:Factory/.pluma.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pluma" Fri Dec 28 12:35:59 2018 rev:20 rq:661676 version:1.20.4 Changes: -------- --- /work/SRC/openSUSE:Factory/pluma/pluma.changes 2018-12-04 20:54:00.500874332 +0100 +++ /work/SRC/openSUSE:Factory/.pluma.new.28833/pluma.changes 2018-12-28 12:36:03.751932391 +0100 @@ -1,0 +2,8 @@ +Wed Dec 26 23:25:34 UTC 2018 - sor.alexei(a)meowr.ru + +- Update to version 1.20.4: + * Disable deprecation warnings for distcheck. + * Move appdata to metainfo directory. + * Update translations. + +------------------------------------------------------------------- Old: ---- pluma-1.20.3.tar.xz New: ---- pluma-1.20.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pluma.spec ++++++ --- /var/tmp/diff_new_pack.qNY6WY/_old 2018-12-28 12:36:04.343931977 +0100 +++ /var/tmp/diff_new_pack.qNY6WY/_new 2018-12-28 12:36:04.343931977 +0100 @@ -19,13 +19,13 @@ %define typelib typelib-1_0-Pluma-1_0 %define _version 1.20 Name: pluma -Version: 1.20.3 +Version: 1.20.4 Release: 0 Summary: Text editor for the MATE desktop License: GPL-2.0-or-later Group: System/GUI/Other URL: https://mate-desktop.org/ -Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz +Source: https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE pluma-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. Patch0: pluma-gtk-3.20.patch BuildRequires: fdupes @@ -129,8 +129,8 @@ %{_libexecdir}/%{name}/ %{_datadir}/glib-2.0/schemas/*.xml %{_datadir}/applications/%{name}.desktop -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/%{name}.appdata.xml +%dir %{_datadir}/metainfo/ +%{_datadir}/metainfo/%{name}.appdata.xml %{_mandir}/man?/%{name}.?%{?ext_man} %{_datadir}/help/C/%{name}/ ++++++ pluma-1.20.3.tar.xz -> pluma-1.20.4.tar.xz ++++++ ++++ 4385 lines of diff (skipped)

1 0

commit gramps for openSUSE:Factory
by root 28 Dec '18

28 Dec '18

Hello community, here is the log from the commit of package gramps for openSUSE:Factory checked in at 2018-12-28 12:35:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gramps (Old) and /work/SRC/openSUSE:Factory/.gramps.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gramps" Fri Dec 28 12:35:56 2018 rev:41 rq:661670 version:5.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gramps/gramps.changes 2018-08-03 12:38:27.379672503 +0200 +++ /work/SRC/openSUSE:Factory/.gramps.new.28833/gramps.changes 2018-12-28 12:36:01.767933780 +0100 @@ -1,0 +2,7 @@ +Sat Dec 22 10:27:20 UTC 2018 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz(a)fastmail.net> + +- Update to version 5.0.1, a maintenance release. Full changelog + available at + https://gramps-project.org/introduction-WP/2018/12/gramps-5-0-1-released/ + +------------------------------------------------------------------- Old: ---- gramps-5.0.0.tar.gz New: ---- gramps-5.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gramps.spec ++++++ --- /var/tmp/diff_new_pack.5uow7v/_old 2018-12-28 12:36:02.807933053 +0100 +++ /var/tmp/diff_new_pack.5uow7v/_new 2018-12-28 12:36:02.807933053 +0100 @@ -13,13 +13,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %global __requires_exclude typelib\$GtkosxApplication\$|typelib\$Gtkspell\$|typelib\$GConf\$ Name: gramps -Version: 5.0.0 +Version: 5.0.1 Release: 0 Summary: Genealogical Research Software License: GPL-2.0-or-later ++++++ gramps-5.0.0.tar.gz -> gramps-5.0.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/gramps/gramps-5.0.0.tar.gz /work/SRC/openSUSE:Factory/.gramps.new.28833/gramps-5.0.1.tar.gz differ: char 26, line 2

1 0