Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 746107 - xfce-extra/xfce4-sensors-plugin-1.3.92-r1 with x11-drivers/nvidia-drivers-? - /usr/include/NVCtrl/NVCtrlLib.h:42:1: error: unknown type name ‘Bool’; did you mean ‘bool’?
Summary: xfce-extra/xfce4-sensors-plugin-1.3.92-r1 with x11-drivers/nvidia-drivers-? -...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal with 1 vote (vote)
Assignee: XFCE Team
URL: https://gitlab.xfce.org/panel-plugins...
Whiteboard:
Keywords: PATCH
: 790110 (view as bug list)
Depends on:
Blocks:
 
Reported: 2020-10-02 08:11 UTC by Miroslav Šulc
Modified: 2021-09-07 13:10 UTC (History)
6 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
build.log (build.log,73.66 KB, text/plain)
2020-10-02 08:11 UTC, Miroslav Šulc
Details
nvctrl xlib fix (nvidia-xlib-fix.patch,411 bytes, patch)
2020-10-03 01:32 UTC, Ionen Wolkens
Details | Diff
compile without patch (without_patch.txt,62.78 KB, text/plain)
2020-12-22 22:39 UTC, jorge
Details
compile with patch (with_patch.txt,62.78 KB, text/plain)
2020-12-22 22:40 UTC, jorge
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Miroslav Šulc gentoo-dev 2020-10-02 08:11:14 UTC
Created attachment 663502 [details]
build.log

libtool: compile:  x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -I../include -DNDEBUG -DPACKAGE_LOCALE_DIR=\"/usr/share/locale\" -pthread -I/usr/include/xfce4/libxfce4ui-2 -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/lib64/libffi/include -I/usr/include/xfce4 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -pthread -I/usr/include/xfce4/libxfce4panel-2.0 -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/lib64/libffi/include -I/usr/include/xfce4 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include -I/usr/include/NVCtrl -pthread -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/lib64/libffi/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -pthread -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/lib64/libffi/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -march=native -O2 -pipe -frecord-gcc-switches -c nvidia.c  -fPIC -DPIC -o .libs/libxfce4sensors_la-nvidia.o
In file included from nvidia.c:39:
/usr/include/NVCtrl/NVCtrlLib.h:42:1: error: unknown type name ‘Bool’; did you mean ‘bool’?
   42 | Bool XNVCTRLQueryExtension (
      | ^~~~
      | bool
/usr/include/NVCtrl/NVCtrlLib.h:43:5: error: unknown type name ‘Display’; did you mean ‘GdkDisplay’?
   43 |     Display *dpy,
      |     ^~~~~~~
      |     GdkDisplay
/usr/include/NVCtrl/NVCtrlLib.h:57:1: error: unknown type name ‘Bool’; did you mean ‘bool’?
   57 | Bool XNVCTRLQueryVersion (
      | ^~~~
      | bool
... (many more)


# emerge --info '=xfce-extra/xfce4-sensors-plugin-1.3.92-r1::gentoo'
Portage 3.0.8 (python 3.7.9-final-0, default/linux/amd64/17.1/hardened, gcc-9.3.0, glibc-2.32-r2, 5.8.12-gentoo x86_64)
=================================================================
                         System Settings
=================================================================
System uname: Linux-5.8.12-gentoo-x86_64-Intel-R-_Core-TM-_i7-3770K_CPU_@_3.50GHz-with-gentoo-2.7
KiB Mem:    32814448 total,   6475192 free
KiB Swap:          0 total,         0 free
Timestamp of repository gentoo: Fri, 02 Oct 2020 07:00:01 +0000
Head commit of repository gentoo: f08584a242c207b2558afcdbe9eb825688b127d7
sh bash 5.0_p18
ld GNU ld (Gentoo 2.35.1 p1) 2.35.1
app-shells/bash:          5.0_p18::gentoo
dev-java/java-config:     2.3.1::gentoo
dev-lang/perl:            5.30.3-r1::gentoo
dev-lang/python:          2.7.18-r4::gentoo, 3.6.12::gentoo, 3.7.9::gentoo, 3.8.6::gentoo, 3.9.0_rc2::gentoo
dev-util/cmake:           3.18.3::gentoo
dev-util/pkgconfig:       0.29.2::gentoo
sys-apps/baselayout:      2.7::gentoo
sys-apps/openrc:          0.42.1::gentoo
sys-apps/sandbox:         2.20::gentoo
sys-devel/autoconf:       2.13-r1::gentoo, 2.69-r5::gentoo
sys-devel/automake:       1.16.2::gentoo
sys-devel/binutils:       2.35.1::gentoo
sys-devel/gcc:            9.3.0-r1::gentoo, 10.2.0-r1::gentoo
sys-devel/gcc-config:     2.3.2::gentoo
sys-devel/libtool:        2.4.6-r6::gentoo
sys-devel/make:           4.3::gentoo
sys-kernel/linux-headers: 5.8::gentoo (virtual/os-headers)
sys-libs/glibc:           2.32-r2::gentoo
Repositories:

gentoo
    location: /usr/portage
    sync-type: rsync
    sync-uri: rsync://rsync.gentoo.org/gentoo-portage
    priority: -1000
    sync-rsync-verify-metamanifest: yes
    sync-rsync-verify-max-age: 24
    sync-rsync-verify-jobs: 1
    sync-rsync-vcs-ignore: true
    sync-rsync-extra-opts: 

fordfrog
    location: /usr/src/fordfrog.git
    masters: gentoo
    priority: 0

local
    location: /usr/local/portage
    masters: gentoo

audio-overlay
    location: /var/lib/layman/audio-overlay
    masters: gentoo
    priority: 50

brother-overlay
    location: /var/lib/layman/brother-overlay
    masters: gentoo
    priority: 50

ceamac
    location: /var/lib/layman/ceamac
    masters: gentoo
    priority: 50

flavour
    location: /var/lib/layman/flavour
    masters: gentoo
    priority: 50

qt
    location: /var/lib/layman/qt
    masters: gentoo
    priority: 50

raiagent
    location: /var/lib/layman/raiagent
    masters: gentoo
    priority: 50

waebbl
    location: /var/lib/layman/waebbl
    masters: gentoo raiagent
    priority: 50

ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="* -@EULA"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=native -O2 -pipe -frecord-gcc-switches"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /opt/brother/scanner/brscan4/brsanenetdevice4.cfg /usr/lib64/libreoffice/program/sofficerc /usr/share/config /usr/share/gnupg/qualified.txt /usr/share/maven-bin-3.0/conf /usr/share/maven-bin-3.1/conf /usr/share/maven-bin-3.2/conf /usr/share/maven-bin-3.3/conf /usr/share/maven-bin-3.6/conf"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c"
CXXFLAGS="-march=native -O2 -pipe -frecord-gcc-switches"
DISTDIR="/usr/portage/distfiles"
EMERGE_DEFAULT_OPTS="--misspell-suggestions n"
ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR"
FCFLAGS="-march=native -O2 -pipe -frecord-gcc-switches"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-march=native -O2 -pipe -frecord-gcc-switches"
GENTOO_MIRRORS="http://distfiles.gentoo.org"
LANG="cs_CZ.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LINGUAS="cs cs_CZ en en_US en_UK"
MAKEOPTS="-j9"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
USE="X a52 aac aacplus acl alsa amd64 aubio bzip2 cdda cddb cdr color-management colord crypt cuda cups d3d9 dbus dia dssi dvb dvd elogind exif ffmpeg flac gegl gif gphoto2 gsm gtk gtk3 hardened hddtemp http2 ibus iconv icu id3tag ipv6 jack jack-dbus jacksession javafx jpeg ladspa lastfm latex lcms libass libglvnd libnotify libproxy libsamplerate libtirpc lilypond lm-sensors lv2 mad modplug mp3 mpeg mpi mtp multilib musepack ncurses nls nptl ocr ogg opencl openexr opengl openmp opus osc pam pcre pdf pie png policykit pulseaudio qt5 raw readline rubberband samba scanner seccomp sf2 sndfile soundio speex spell split-usr ssl ssp startup-notification svg svg2 taglib theora tiff timidity tk tray truetype udev unicode usb vaapi vamp vdpau visio vorbis vpx vst vulkan wavpack webp widevine wmf x264 x265 xattr xinerama xmp xtpax xv xvid xvmc zlib" ABI_X86="32 64" ADA_TARGET="gnat_2018" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" APACHE2_MODULES="alias auth_basic authn_core authn_file authz_core authz_host authz_user cgi cgid deflate dir expires filter headers http2 include info log_config mime mime_magic negotiation proxy proxy_ajp rewrite setenvif socache_shmcb status unixd vhost_alias" APACHE2_MPMS="event" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="aes avx f16c mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="evdev libinput synaptics wacom" KERNEL="linux" L10N="cs cs-CZ en en-US en-UK" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-2 php7-3 php7-4" POSTGRES_TARGETS="postgres10 postgres11" PYTHON_SINGLE_TARGET="python3_7" PYTHON_TARGETS="python3_6 python3_7 python3_8 python3_9" RUBY_TARGETS="ruby25 ruby26 ruby27" SANE_BACKENDS="genesys" USERLAND="GNU" VIDEO_CARDS="intel i915 i965 nvidia radeon radeonsi" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CC, CPPFLAGS, CTARGET, CXX, INSTALL_MASK, LC_ALL, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS

=================================================================
                        Package Settings
=================================================================

xfce-extra/xfce4-sensors-plugin-1.3.92-r1::gentoo was built with the following:
USE="acpi hddtemp libnotify lm-sensors" ABI_X86="(64)" VIDEO_CARDS="-nvidia"


# emerge -pqv '=xfce-extra/xfce4-sensors-plugin-1.3.92-r1::gentoo'
[ebuild   R   ] xfce-extra/xfce4-sensors-plugin-1.3.92-r1  USE="acpi hddtemp libnotify lm-sensors" VIDEO_CARDS="nvidia*"


 equery list nvidia-drivers
 * Searching for nvidia-drivers ...
[IP-] [  ] x11-drivers/nvidia-drivers-455.23.04-r1:0/455
Comment 1 Ionen Wolkens gentoo-dev 2020-10-03 01:15:27 UTC
I don't use this but think I can point in the right direction

My own code (a fan control daemon I wrote that use libXNVCtrl.a) still compiles fine, but includes X11/Xlib.h before NVCtrl*.h. If I remove Xlib.h then I get the same errors, I assume it's (now) missing here too.

1.3.92-r1 emerges fine against stable xfce4 dependencies, but on ~amd64 I guess some headers in dependencies changed and was able to reproduce. I tried both with nvidia-drivers-450.66 and 455.23.04 with same results.
Comment 2 Ionen Wolkens gentoo-dev 2020-10-03 01:32:38 UTC
Created attachment 663577 [details, diff]
nvctrl xlib fix

Might as well provide a patch, it's really trivial (and should get upstreamed).
Comment 3 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2020-10-03 03:44:09 UTC
I dare say whatever nvidia headers need it should #include it.
Comment 4 Miroslav Šulc gentoo-dev 2020-10-03 04:54:51 UTC
thank you for pointing out the correct include. i put it in /usr/include/NVCtrl/NVCtrlLib.h instead as that is imo the correct file where it belongs (as Michal wrote) and xfce4-sensors-plugin compiles fine. so changing this bug to nvidia-drivers issue.
Comment 5 Ionen Wolkens gentoo-dev 2020-10-03 07:55:09 UTC
I'm personally against patching the headers in gentoo, if upstream nvidia does it it's fine.

I'd rather not end up writing software that I think works fine only to be told it fail to build on another distribution that didn't patch the headers.
Comment 6 Jeroen Roovers (RETIRED) gentoo-dev 2020-10-07 18:05:13 UTC
Comment on attachment 663577 [details, diff]
nvctrl xlib fix

I think this was rejected.
Comment 7 Jeroen Roovers (RETIRED) gentoo-dev 2020-10-07 18:26:19 UTC
Comment on attachment 663577 [details, diff]
nvctrl xlib fix

Actually I think that looks pretty good.
Comment 8 Jeroen Roovers (RETIRED) gentoo-dev 2020-10-07 18:27:05 UTC
"Resorted include files in nvidia implementation". Because alphabetical sorting.

https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/commit/e8e0c5969a1dbd16fad6b9a86ceb461403a242eb
Comment 9 Jeroen Roovers (RETIRED) gentoo-dev 2020-10-07 18:30:05 UTC
Comment on attachment 663577 [details, diff]
nvctrl xlib fix

This patch partially reverts the commit in [URL] and fixes the problem.
Comment 10 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2020-10-07 18:33:02 UTC
Convince upstream to accept it.
Comment 11 jorge 2020-12-22 20:29:15 UTC
I can confirm building xfce4-sensors-plugin (stable 1.3.0-r1 or testing 1.3.92-r1) compiles fine with stable (non ~amd64) xfce dependencies. With ~amd64 xfce*, neither version compiles, even with the patch.

*NOTE: In particular, I have the following packages with ~amd64 (dependency graph for xfce4-sensors-plugin):

******************************************************************************
equery depgraph xfce4-sensors-plugin
 * Searching for xfce4-sensors-plugin ...

 * dependency graph for xfce-extra/xfce4-sensors-plugin-1.3.0-r1
 `--  xfce-extra/xfce4-sensors-plugin-1.3.0-r1  amd64 
   `--  x11-libs/gtk+-3.24.22  (>=x11-libs/gtk+-3.20) amd64 
   `--  xfce-base/libxfce4ui-4.15.8  (>=xfce-base/libxfce4ui-4.12) ~amd64  [gtk3(+)]
   `--  xfce-base/xfce4-panel-4.15.6  (>=xfce-base/xfce4-panel-4.12) ~amd64 
   `--  app-admin/hddtemp-0.3_beta15-r29  (app-admin/hddtemp) amd64 
   `--  net-analyzer/openbsd-netcat-1.195  (net-analyzer/openbsd-netcat) amd64 
   `--  net-analyzer/netcat-110-r9  (net-analyzer/netcat) amd64 
   `--  x11-libs/libnotify-0.7.9  (>=x11-libs/libnotify-0.7) amd64 
   `--  sys-apps/lm-sensors-3.6.0  (>=sys-apps/lm-sensors-3.1.0) amd64 
   `--  x11-drivers/nvidia-drivers-455.28-r1  (x11-drivers/nvidia-drivers) amd64  [tools static-libs]
   `--  dev-util/intltool-0.51.0-r2  (dev-util/intltool) amd64 
   `--  virtual/pkgconfig-2  (virtual/pkgconfig) amd64 
[ xfce-extra/xfce4-sensors-plugin-1.3.0-r1 stats: packages (12), max depth (1) ]
*******************************************************************************
Comment 12 Ionen Wolkens gentoo-dev 2020-12-22 21:35:29 UTC
(In reply to jorge from comment #11)
> With ~amd64 xfce*, neither version compiles, even with the patch.
Even with the patch? I just tried both versions again and still builds fine with ~amd64 deps if I use the patch.

Is it really the same error? logs? Was the patch really applied?
Comment 13 jorge 2020-12-22 22:39:48 UTC
Created attachment 679257 [details]
compile without patch
Comment 14 jorge 2020-12-22 22:40:13 UTC
Created attachment 679260 [details]
compile with patch
Comment 15 jorge 2020-12-22 22:44:53 UTC
(In reply to Ionen Wolkens from comment #12)
> (In reply to jorge from comment #11)
> > With ~amd64 xfce*, neither version compiles, even with the patch.
> Even with the patch? I just tried both versions again and still builds fine
> with ~amd64 deps if I use the patch.
> 
> Is it really the same error? logs? Was the patch really applied?

The patch was copied to:

/etc/portage/xfce-extra/xfce4-sensors-plugin/sensors.patch

other than that I'm not sure if it was really applied =S

I attached two logs, with and without patch. They are the same, except for two lines (273 and 275).
Comment 16 Ionen Wolkens gentoo-dev 2020-12-22 22:50:15 UTC
If it was applied you'd see:
 * Applying sensors.patch ... [ ok ]
 * User patches applied.

/etc/portage/xfce-extra/xfce4-sensors-plugin/sensors.patch
should be
/etc/portage/patches/xfce-extra/xfce4-sensors-plugin/sensors.patch
             ^^^^^^^
Comment 17 jorge 2020-12-22 22:53:40 UTC
(In reply to Ionen Wolkens from comment #16)
> If it was applied you'd see:
>  * Applying sensors.patch ... [ ok ]
>  * User patches applied.
> 
> /etc/portage/xfce-extra/xfce4-sensors-plugin/sensors.patch
> should be
> /etc/portage/patches/xfce-extra/xfce4-sensors-plugin/sensors.patch
>              ^^^^^^^

Yes, that was the problem... my bad. The package now compiles fine.
Comment 18 Ionen Wolkens gentoo-dev 2021-03-21 23:15:46 UTC
(In reply to Michał Górny from comment #10)
> Convince upstream to accept it.
https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/commit/fa63a854bf2f4a651260e635e8fdc34e423b6018
Comment 19 Ionen Wolkens gentoo-dev 2021-05-14 08:53:17 UTC
*** Bug 790110 has been marked as a duplicate of this bug. ***
Comment 20 Alexander Bruns 2021-05-14 09:36:01 UTC
Moin,

I opened this here 

https://bugs.gentoo.org/790110

and it seems to be doublicate of this bug.

Why is there a patch but not included in the recent version?

I tried to compile 

emerge -a =xfce-extra/xfce4-sensors-plugin-1.3.95

It seems there is a patch, but how Do I include that into the compule action. And why is this, which is available sind 5 Months not in the recent ebuild-file used?

Alexander
Comment 21 jorge 2021-05-14 14:14:15 UTC
(In reply to Alexander Bruns from comment #20)
> Moin,
> 
> I opened this here 
> 
> https://bugs.gentoo.org/790110
> 
> and it seems to be doublicate of this bug.
> 
> Why is there a patch but not included in the recent version?
> 
> I tried to compile 
> 
> emerge -a =xfce-extra/xfce4-sensors-plugin-1.3.95
> 
> It seems there is a patch, but how Do I include that into the compule
> action. 

Hello, take the file "nvctrl xlib fix" and save it in /etc/portage/patches/xfce-extra/xfce4-sensors-plugin/

as something.patch. Then compile as usual.

> And why is this, which is available sind 5 Months not in the recent
> ebuild-file used?
> 
> Alexander
Comment 22 Manuel Garcia Wolff 2021-05-14 21:23:49 UTC
I am also affected by this bug. Any reason why the patch has not been included yet?
Comment 23 Alexander Bruns 2021-05-15 15:41:59 UTC
Ok downloaded this file as diff:

https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/commit/e8e0c5969a1dbd16fad6b9a86ceb461403a242eb

And put to:

/etc/portage/patches/xfce-extra/xfce4-sensors-plugin/somthing.patch

now I get this:

holodeck ~ # emerge -a =xfce-extra/xfce4-sensors-plugin-1.3.95 \

...

Would you like to merge these packages? [Yes/No] y

>>> Verifying ebuild manifests

>>> Emerging (1 of 1) xfce-extra/xfce4-sensors-plugin-1.3.95::gentoo
 * xfce4-sensors-plugin-1.3.95.tar.bz2 BLAKE2B SHA512 size ;-) ...                             [ ok ]
>>> Unpacking source...
>>> Unpacking xfce4-sensors-plugin-1.3.95.tar.bz2 to /var/tmp/portage/xfce-extra/xfce4-sensors-plugin-1.3.95/work
>>> Source unpacked in /var/tmp/portage/xfce-extra/xfce4-sensors-plugin-1.3.95/work
>>> Preparing source in /var/tmp/portage/xfce-extra/xfce4-sensors-plugin-1.3.95/work/xfce4-sensors-plugin-1.3.95 ...
 * Applying something.patch ...
patching file lib/nvidia.c
Hunk #1 FAILED at 23.
Hunk #2 succeeded at 40 with fuzz 2 (offset 1 line).
1 out of 2 hunks FAILED -- saving rejects to file lib/nvidia.c.rej                             [ !! ]
 * ERROR: xfce-extra/xfce4-sensors-plugin-1.3.95::gentoo failed (prepare phase):
 *   patch -p1  failed with /etc/portage/patches/xfce-extra/xfce4-sensors-plugin/something.patch
 * * Call stack:
 *               ebuild.sh, line  125:  Called src_prepare
 *             environment, line 1574:  Called default
 *      phase-functions.sh, line  855:  Called default_src_prepare
 *      phase-functions.sh, line  920:  Called __eapi6_src_prepare
 *             environment, line  254:  Called eapply_user
 *             environment, line  538:  Called eapply '/etc/portage/patches/xfce-extra/xfce4-sensors-plugin/something.patch'
 *             environment, line  508:  Called _eapply_patch '/etc/portage/patches/xfce-extra/xfce4-sensors-plugin/something.patch'
 *             environment, line  446:  Called __helpers_die 'patch -p1  failed with /etc/portage/patches/xfce-extra/xfce4-sensors-plugin/something.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *              die "$@"
 * 
 * If you need support, post the output of `emerge --info '=xfce-extra/xfce4-sensors-plugin-1.3.95::gentoo'`,
 * the complete build log and the output of `emerge -pqv '=xfce-extra/xfce4-sensors-plugin-1.3.95::gentoo'`.
 * The complete build log is located at '/var/tmp/portage/xfce-extra/xfce4-sensors-plugin-1.3.95/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/xfce-extra/xfce4-sensors-plugin-1.3.95/temp/environment'.
 * Working directory: '/var/tmp/portage/xfce-extra/xfce4-sensors-plugin-1.3.95/work/xfce4-sensors-plugin-1.3.95'
 * S: '/var/tmp/portage/xfce-extra/xfce4-sensors-plugin-1.3.95/work/xfce4-sensors-plugin-1.3.95'

>>> Failed to emerge xfce-extra/xfce4-sensors-plugin-1.3.95, Log file:

>>>  '/var/tmp/portage/xfce-extra/xfce4-sensors-plugin-1.3.95/temp/build.log'


Sure the patch is still valid for the recent versions?

Alex
Comment 24 Ionen Wolkens gentoo-dev 2021-05-15 16:01:55 UTC
(In reply to Alexander Bruns from comment #23)
> Ok downloaded this file as diff:
> 
> https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/commit/
> e8e0c5969a1dbd16fad6b9a86ceb461403a242eb
> ;...]
> Sure the patch is still valid for the recent versions?
That's not the fix, it's the commit that introduced the issue.

The fix is either the upstreamed:
https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/commit/fa63a854bf2f4a651260e635e8fdc34e423b6018

Or my old patch from comment #2 that's the same minus the comment.
Comment 25 Alexander Bruns 2021-05-15 20:03:15 UTC
Ok now it worked. Why is the ebuild not simply updated and the patch included like in other ebuilds? That would ease it for many users. Everybody has to do this manual step?

Anyway thx for providong this patch.

Alex
Comment 26 Ionen Wolkens gentoo-dev 2021-05-15 20:10:21 UTC
(In reply to Alexander Bruns from comment #25)
> Ok now it worked. Why is the ebuild not simply updated and the patch
> included like in other ebuilds?
There was some disagreement on how this should be fixed because nvidia's headers are silly.

Albeit now that it's upstreamed I'd say backporting it would be fair rather than wait for next release.
Comment 27 Markus Giese 2021-06-03 10:33:12 UTC
xfce-extra/xfce4-sensors-plugin-1.3.95

compiles fine with above mentioned patch(nvctrl xlib fix), when put in /etc/portage/patches/xfce-extra/xfce4-sensors-plugin.

thank you
Comment 28 jorge 2021-08-01 15:25:38 UTC
For me, the patch is no longer needed as of xfce-extra/xfce4-sensors-plugin-1.4.1 (using x11-drivers/nvidia-drivers-460.91.03)
Comment 29 jorge 2021-08-10 15:09:14 UTC
(In reply to jorge from comment #28)
> For me, the patch is no longer needed (NOT TRUE) as of
> xfce-extra/xfce4-sensors-plugin-1.4.1 (using
> x11-drivers/nvidia-drivers-460.91.03)

I don't know why the package compiled when I removed the patch from the directory. But after a system reinstall, I did have to make the patch available.
Comment 30 Markus Giese 2021-09-07 12:51:29 UTC
 * Applying sensors.patch ...
patching file lib/nvidia.c
patch unexpectedly ends in middle of line
Hunk #1 FAILED at 35.
1 out of 1 hunk FAILED -- saving rejects to file lib/nvidia.c.rej                                              [ !! ]
 * ERROR: xfce-extra/xfce4-sensors-plugin-1.4.1::gentoo failed (prepare phase):
 *   patch -p1  failed with /etc/portage/patches/xfce-extra/xfce4-sensors-plugin/sensors.patch


same error here with 1.4.1 and 1.3.95

patch applied at : 

/etc/portage/patches/xfce-extra/xfce4-sensors-plugin


suggestions ?
Comment 31 Markus Giese 2021-09-07 12:57:19 UTC
sorry, 1.3.95 not available anylonger
Comment 32 Ionen Wolkens gentoo-dev 2021-09-07 13:10:28 UTC
Just remove the patch from /etc/portage, it's fixed in the new version and so it's trying to fix what's already fixed and failing.

Given 1.4.1 is the only version the tree now, guess I'll close this on behalf of xfce's team.

Fixed by:
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edeb548edafa9dd92ba8bdd88845712ca376bbb9