Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nautilus-dropbox for
openSUSE:Factory checked in at 2025-09-08 13:05:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nautilus-dropbox (Old)
and /work/SRC/openSUSE:Factory/.nautilus-dropbox.new.1977 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nautilus-dropbox"
Mon Sep 8 13:05:20 2025 rev:22 rq:1303129 version:2025.05.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/nautilus-dropbox/nautilus-dropbox.changes
2024-11-12 19:25:21.769360825 +0100
+++
/work/SRC/openSUSE:Factory/.nautilus-dropbox.new.1977/nautilus-dropbox.changes
2025-09-08 13:05:38.929533408 +0200
@@ -1,0 +2,15 @@
+Thu Sep 4 06:07:59 UTC 2025 - Dominique Leuenberger <[email protected]>
+
+- Update to version 2025.05.20:
+ + Add package validation workflow
+ + Update dependencies to include GdkPixbuf and related libraries
+ + Upgrade to python 3.9
+ + Use gtk in build_dropbox.py
+ + Turn off display before importing gtk
+ + Changed to gtk version 4
+ + Remove 32bit support from nautilus-dropbox
+- Exclusively build for x86_64: the platform code returns
+ FatalVisibleError("Platform not supported") for anything but
+ x86_64.
+
+-------------------------------------------------------------------
Old:
----
nautilus-dropbox-2024.04.17.obscpio
New:
----
nautilus-dropbox-2025.05.20.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nautilus-dropbox.spec ++++++
--- /var/tmp/diff_new_pack.f4FjTe/_old 2025-09-08 13:05:39.629562826 +0200
+++ /var/tmp/diff_new_pack.f4FjTe/_new 2025-09-08 13:05:39.633562994 +0200
@@ -19,7 +19,7 @@
%global nautilus_extdir %( pkg-config libnautilus-extension-4 --variable
extensiondir )
Name: nautilus-dropbox
-Version: 2024.04.17
+Version: 2025.05.20
Release: 0
Summary: Dropbox client integrated into Nautilus
License: GPL-3.0-or-later AND CC-BY-ND-3.0
@@ -33,6 +33,7 @@
BuildRequires: python3-gobject
BuildRequires: pkgconfig(gtk4)
BuildRequires: pkgconfig(libnautilus-extension-4) >= 43.rc
+ExclusiveArch: x86_64
%description
Dropbox is a free service that lets you bring your photos, docs, and videos
anywhere
++++++ _service ++++++
--- /var/tmp/diff_new_pack.f4FjTe/_old 2025-09-08 13:05:39.661564171 +0200
+++ /var/tmp/diff_new_pack.f4FjTe/_new 2025-09-08 13:05:39.661564171 +0200
@@ -3,7 +3,7 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://github.com/dropbox/nautilus-dropbox.git</param>
- <param name="revision">v2024.04.17</param>
+ <param name="revision">v2025.05.20</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">v?(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>
++++++ nautilus-dropbox-2024.04.17.obscpio ->
nautilus-dropbox-2025.05.20.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/nautilus-dropbox-2024.04.17/.github/workflows/canary.yml
new/nautilus-dropbox-2025.05.20/.github/workflows/canary.yml
--- old/nautilus-dropbox-2024.04.17/.github/workflows/canary.yml
2024-04-18 01:31:10.000000000 +0200
+++ new/nautilus-dropbox-2025.05.20/.github/workflows/canary.yml
2025-05-30 00:54:53.000000000 +0200
@@ -8,15 +8,35 @@
- cron: "29 1 * * 1"
workflow_dispatch:
jobs:
- ubuntu:
+ # Source builds are performed on the latest beta of each supported distro to
+ # make sure we catch any code issues as soon as possible.
+ validate-source-build:
+ strategy:
+ matrix:
+ config:
+ - image: ubuntu:devel
+ deps-script: install-apt-deps.sh
+ codename: $VERSION_CODENAME
+ pretty-name: $NAME $VERSION
+ codenames: $UBUNTU_CODENAMES
+ - image: debian:sid
+ deps-script: install-apt-deps.sh
+ codename: $VERSION_CODENAME
+ pretty-name: $PRETTY_NAME
+ codenames: $DEBIAN_CODENAMES
+ - image: fedora:rawhide
+ deps-script: install-rpm-deps.sh
+ codename: $VERSION_ID
+ pretty-name: Fedora $VERSION_ID
+ codenames: $FEDORA_CODENAMES
runs-on: ubuntu-latest
container:
- image: ubuntu:devel
+ image: ${{ matrix.config.image }}
steps:
- name: Clone repo
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Install deps
- run: ./install-apt-deps.sh
+ run: ./${{ matrix.config.deps-script }}
- name: Test build
run: ./autogen.sh && make && make install
- name: Run tests
@@ -25,42 +45,75 @@
run: |
. ./distro-info.sh
. /etc/os-release
- ./check-distro-info-support.sh "$VERSION_CODENAME" "$NAME $VERSION"
"$UBUNTU_CODENAMES"
+ ./check-distro-info-support.sh \
+ "${{ matrix.config.codename }}" \
+ "${{ matrix.config.pretty-name }}" \
+ "${{ matrix.config.codenames }}"
- debian:
+ build-packages:
runs-on: ubuntu-latest
- container:
- image: debian:sid
steps:
- name: Clone repo
- uses: actions/checkout@v3
- - name: Install deps
- run: ./install-apt-deps.sh
- - name: Test build
- run: ./autogen.sh && make && make install
- - name: Run tests
- run: python3 ./dropbox_test.py
- - name: Check that latest OS version is supported
- run: |
- . ./distro-info.sh
- . /etc/os-release
- ./check-distro-info-support.sh "$VERSION_CODENAME" "$PRETTY_NAME"
"$DEBIAN_CODENAMES"
+ uses: actions/checkout@v4
+ - name: Build packages
+ run: ./build_packages.sh
+ - name: Upload Ubuntu packages
+ uses: actions/upload-artifact@v4
+ with:
+ name: ubuntu_packages
+ path: build/ubuntu/pool/main
+ - name: Upload Debian packages
+ uses: actions/upload-artifact@v4
+ with:
+ name: debian_packages
+ path: build/debian/pool/main
+ - name: Upload Fedora packages
+ uses: actions/upload-artifact@v4
+ with:
+ name: fedora_packages
+ path: build/fedora/pool
- fedora:
+ test_debs:
+ needs: build-packages
+ strategy:
+ matrix:
+ platform:
+ # Test on all Debian and Ubuntu LTS releases that have GTK 4+, plus
+ # prerelease to make sure there are no package dependency issues.
+ - distro: debian
+ version: bookworm
+ - distro: debian
+ version: sid
+ - distro: ubuntu
+ version: "24.04"
+ - distro: ubuntu
+ version: devel
runs-on: ubuntu-latest
container:
- image: fedora:rawhide
+ image: "${{ matrix.platform.distro }}:${{ matrix.platform.version }}"
+ env:
+ DEBIAN_FRONTEND: noninteractive
steps:
- - name: Clone repo
- uses: actions/checkout@v3
- - name: Install deps
- run: ./install-rpm-deps.sh
- - name: Test build
- run: ./autogen.sh && make && make install
- - name: Run tests
- run: python3 ./dropbox_test.py
- - name: Check that latest OS version is supported
- run: |
- . ./distro-info.sh
- . /etc/os-release
- ./check-distro-info-support.sh "$VERSION_ID" "Fedora $VERSION_ID"
"$FEDORA_CODENAMES"
+ - name: Download packages
+ uses: actions/download-artifact@v4
+ with:
+ name: "${{ matrix.platform.distro }}_packages"
+ - name: Install packages
+ run: apt update && apt upgrade -y && apt install -y --fix-missing
./dropbox_*.*.*_amd64.deb
+
+ test_rpm:
+ needs: build-packages
+ strategy:
+ matrix:
+ # Fedora doesn't have LTS releases, so just run on latest and rawhide.
+ version: [latest, rawhide]
+ runs-on: ubuntu-latest
+ container:
+ image: "fedora:${{ matrix.version }}"
+ steps:
+ - name: Download packages
+ uses: actions/download-artifact@v4
+ with:
+ name: "fedora_packages"
+ - name: Install packages
+ run: dnf upgrade -y && dnf install -y
./nautilus-dropbox-*.*.*-*.*.x86_64.rpm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nautilus-dropbox-2024.04.17/ChangeLog
new/nautilus-dropbox-2025.05.20/ChangeLog
--- old/nautilus-dropbox-2024.04.17/ChangeLog 2024-04-18 01:31:10.000000000
+0200
+++ new/nautilus-dropbox-2025.05.20/ChangeLog 2025-05-30 00:54:53.000000000
+0200
@@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
Date based versioning is now used in this project. This is so that it doesn't
get confused with the Dropbox desktop client.
+Version 2025.05.20
+==================
+ * Add Ubuntu 25.04, Ubuntu 25.10, Fedora 42, and Fedora 43 to build
matrix
+ * Remove support for 32-bit platforms
+
Version 2024.04.17
==================
* Add Ubuntu 24.04 to build matrix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nautilus-dropbox-2024.04.17/Makefile.am
new/nautilus-dropbox-2025.05.20/Makefile.am
--- old/nautilus-dropbox-2024.04.17/Makefile.am 2024-04-18 01:31:10.000000000
+0200
+++ new/nautilus-dropbox-2025.05.20/Makefile.am 2025-05-30 00:54:53.000000000
+0200
@@ -14,3 +14,4 @@
$(RST2MAN) dropbox.txt > dropbox.1
SUBDIRS = data src
+MKDIR_P = /bin/mkdir -p
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nautilus-dropbox-2024.04.17/build_dropbox.py
new/nautilus-dropbox-2025.05.20/build_dropbox.py
--- old/nautilus-dropbox-2024.04.17/build_dropbox.py 2024-04-18
01:31:10.000000000 +0200
+++ new/nautilus-dropbox-2025.05.20/build_dropbox.py 2025-05-30
00:54:53.000000000 +0200
@@ -1,9 +1,7 @@
import sys
-import gi
-gi.require_version('GdkPixbuf', '2.0')
-from gi.repository import GdkPixbuf
-
import re
+import os
+import base64
def replace_many(src2dest, buf):
src_re = re.compile('|'.join(re.escape(word) for word in src2dest))
@@ -12,18 +10,36 @@
return src2dest[mo.group()]
return src_re.sub(replace_repl, buf)
+def get_base64_image_data(filepath):
+ # Load image and convert to base64 string
+ if not os.path.exists(filepath):
+ raise FileNotFoundError(f"Image not found: {filepath}")
+
+ with open(filepath, "rb") as f:
+ data = f.read()
+ # Encode image binary to base64 string literal
+ return base64.b64encode(data).decode('ascii')
+
if __name__ == '__main__':
- pixbuf64 =
GdkPixbuf.Pixbuf.new_from_file("data/icons/hicolor/64x64/apps/dropbox.png")
- pixbuf16 =
GdkPixbuf.Pixbuf.new_from_file("data/icons/hicolor/16x16/apps/dropbox.png")
- src2dest = {'@PACKAGE_VERSION@': sys.argv[1],
- '@DESKTOP_FILE_DIR@': sys.argv[2],
- '@IMAGEDATA64@': ("GdkPixbuf.Pixbuf.new_from_data(%r,
GdkPixbuf.Colorspace.RGB, %r, %r, %r, %r, %r)" %
- (pixbuf64.get_pixels(),
pixbuf64.get_has_alpha(), pixbuf64.get_bits_per_sample(),
- pixbuf64.get_width(),
pixbuf64.get_height(), pixbuf64.get_rowstride())),
- '@IMAGEDATA16@': ("GdkPixbuf.Pixbuf.new_from_data(%r,
GdkPixbuf.Colorspace.RGB, %r, %r, %r, %r, %r)" %
- (pixbuf16.get_pixels(),
pixbuf16.get_has_alpha(), pixbuf16.get_bits_per_sample(),
- pixbuf16.get_width(),
pixbuf16.get_height(), pixbuf16.get_rowstride())),
- }
+ try:
+ print(f"Current working directory: {os.getcwd()}", file=sys.stderr)
+
+ icon64_path = "data/icons/hicolor/64x64/apps/dropbox.png"
+ icon16_path = "data/icons/hicolor/16x16/apps/dropbox.png"
+
+ image64_data = get_base64_image_data(icon64_path)
+ image16_data = get_base64_image_data(icon16_path)
+
+ # Create simple placeholder strings that the app consuming this must
decode if needed
+ src2dest = {
+ '@PACKAGE_VERSION@': sys.argv[1],
+ '@DESKTOP_FILE_DIR@': sys.argv[2],
+ '@IMAGEDATA64@': repr(image64_data), # Use repr() to properly
escape the string
+ '@IMAGEDATA16@': repr(image16_data), # Use repr() to properly
escape the string
+ }
- buf = sys.stdin.read()
- sys.stdout.write(replace_many(src2dest, buf))
+ buf = sys.stdin.read()
+ sys.stdout.write(replace_many(src2dest, buf))
+ except Exception as e:
+ print(f"Error in build_dropbox.py: {str(e)}", file=sys.stderr)
+ sys.exit(1)
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nautilus-dropbox-2024.04.17/configure.ac
new/nautilus-dropbox-2025.05.20/configure.ac
--- old/nautilus-dropbox-2024.04.17/configure.ac 2024-04-18
01:31:10.000000000 +0200
+++ new/nautilus-dropbox-2025.05.20/configure.ac 2025-05-30
00:54:53.000000000 +0200
@@ -1,6 +1,6 @@
# Initialization
-AC_INIT([nautilus-dropbox], 2024.04.17)
+AC_INIT([nautilus-dropbox], 2025.05.20)
AM_INIT_AUTOMAKE([foreign])
@@ -133,4 +133,6 @@
data/icons/hicolor/256x256/apps/Makefile
data/emblems/Makefile])
+AC_SUBST([MKDIR_P], ['/bin/mkdir -p'])
+
AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nautilus-dropbox-2024.04.17/distro-info.sh
new/nautilus-dropbox-2025.05.20/distro-info.sh
--- old/nautilus-dropbox-2024.04.17/distro-info.sh 2024-04-18
01:31:10.000000000 +0200
+++ new/nautilus-dropbox-2025.05.20/distro-info.sh 2025-05-30
00:54:53.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/sh
# This file also gets execfile'd by python so don't do anything here besides
set variables.
-UBUNTU_CODENAMES="kinetic lunar mantic noble"
+UBUNTU_CODENAMES="kinetic lunar mantic noble oracular plucky questing"
DEBIAN_CODENAMES="bookworm trixie sid"
-FEDORA_CODENAMES="37 38 39 40 41"
+FEDORA_CODENAMES="37 38 39 40 41 42 43"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nautilus-dropbox-2024.04.17/dropbox.in
new/nautilus-dropbox-2025.05.20/dropbox.in
--- old/nautilus-dropbox-2024.04.17/dropbox.in 2024-04-18 01:31:10.000000000
+0200
+++ new/nautilus-dropbox-2025.05.20/dropbox.in 2025-05-30 00:54:53.000000000
+0200
@@ -37,6 +37,7 @@
import time
import traceback
import urllib.request
+import base64
try:
import gpg
@@ -121,11 +122,7 @@
def plat():
if sys.platform.lower().startswith('linux'):
arch = platform.machine()
- if (arch[0] == 'i' and
- arch[1].isdigit() and
- arch[2:4] == '86'):
- plat = "x86"
- elif arch == 'x86_64':
+ if arch == 'x86_64':
plat = arch
else:
FatalVisibleError("Platform not supported")
@@ -284,8 +281,25 @@
import gi
gi.require_version('GdkPixbuf', '2.0')
from gi.repository import GdkPixbuf
- box_logo_pixbuf = @IMAGEDATA64@
- window_icon = @IMAGEDATA16@
+ import base64
+ from io import BytesIO
+
+ # Decode base64 string to bytes
+ image64_str = eval("@IMAGEDATA64@") # Use eval() to safely unescape a
`repr()`d string
+ image16_str = eval("@IMAGEDATA16@") # Use eval() to safely unescape a
`repr()`d string
+ image64_bytes = base64.b64decode(image64_str)
+ image16_bytes = base64.b64decode(image16_str)
+
+ # Create GdkPixbuf from bytes
+ loader64 = GdkPixbuf.PixbufLoader()
+ loader64.write(image64_bytes)
+ loader64.close()
+ box_logo_pixbuf = loader64.get_pixbuf()
+
+ loader16 = GdkPixbuf.PixbufLoader()
+ loader16.write(image16_bytes)
+ loader16.close()
+ window_icon = loader16.get_pixbuf()
GUI_AVAILABLE = os.environ.get("DISPLAY", '')
++++++ nautilus-dropbox.obsinfo ++++++
--- /var/tmp/diff_new_pack.f4FjTe/_old 2025-09-08 13:05:39.805570223 +0200
+++ /var/tmp/diff_new_pack.f4FjTe/_new 2025-09-08 13:05:39.809570391 +0200
@@ -1,5 +1,5 @@
name: nautilus-dropbox
-version: 2024.04.17
-mtime: 1713396670
-commit: e0aeba971d11e86ec9acfb800084dcd93cece931
+version: 2025.05.20
+mtime: 1748559293
+commit: 7b9ff31208485e9e15fde2763b68da92ad23723d
