Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow image formats to be disabled from dillorc #316

Merged
merged 2 commits into from
Dec 8, 2024

Conversation

rodarima
Copy link
Member

@rodarima rodarima commented Dec 8, 2024

Makes disabling certain formats posible without the need to rebuild Dillo from source.

See: #312

@rodarima rodarima added this to the Release 3.2.0 milestone Dec 8, 2024
@rodarima rodarima force-pushed the disable-image-formats branch from bd89868 to bfd2c7b Compare December 8, 2024 15:41
@rodarima
Copy link
Member Author

rodarima commented Dec 8, 2024

@xlex8 could you take a look at this PR?

@rodarima rodarima force-pushed the disable-image-formats branch from bfd2c7b to 6ccdca0 Compare December 8, 2024 15:57
@xlex8
Copy link
Contributor

xlex8 commented Dec 8, 2024

This branch is not compiling here:
...
c++ -DHAVE_CONFIG_H -I. -I.. -I.. -DDILLO_SYSCONF='"/usr/local/etc/dillo/"' -DDILLO_DOCDIR='"/usr/local/share/doc/dillo/"' -I/usr/local/include -I/usr/X11R6/include -I/usr/local/include/libpng16 -I/usr/local/include -I/usr/X11R6/include/freetype2 -O2 -pipe -I/usr/local/include -fvisibility-inlines-hidden -I/usr/X11R6/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_THREAD_SAFE -D_REENTRANT -I/usr/X11R6/lib -Wall -W -Wno-unused-parameter -fno-rtti -fno-exceptions -pedantic -std=c++11 -D_POSIX_C_SOURCE=200112L -MT tipwin.o -MD -MP -MF .deps/tipwin.Tpo -c -o tipwin.o tipwin.cc
version.cc:40:25: error: no member named 'api_version' in 'Fl'
int fltkver = Fl::api_version();
~~~~^
1 error generated.

@rodarima
Copy link
Member Author

rodarima commented Dec 8, 2024

version.cc:40:25: error: no member named 'api_version' in 'Fl'

Which FLTK version are you using? The method should be available on 1.3.X:

https://www.fltk.org/doc-1.3/classFl.html#a7600b0ef3dcd4311850ab4b2988d5d6d

@xlex8
Copy link
Contributor

xlex8 commented Dec 8, 2024

Stock FLTK 1.3.3 here. Just did a new build of master with no errors, and also some older checkouts, so it seems to be a recent change.

@rodarima
Copy link
Member Author

rodarima commented Dec 8, 2024

Stock FLTK 1.3.3 here. Just did a new build of master with no errors, and also some older checkouts, so it seems to be a recent change.

Right, on 1.3.3 it was not available yet, I need to use Fl::version() instead.

https://github.com/fltk/fltk/blob/release-1.3.3/src/Fl.cxx#L135C1-L135C12

Let me do a quick patch so it builds for you too.

@rodarima
Copy link
Member Author

rodarima commented Dec 8, 2024

Should be fixed in 486cdad

@xlex8
Copy link
Contributor

xlex8 commented Dec 8, 2024

Thanks, this PR appears to be working fine now!

Makes disabling certain formats posible without the need to rebuild
Dillo from source.

See: #312
The Fl:api_version() method is not available on FLTK 1.3.3 and older, it
needs to use Fl::version() instead.
@rodarima rodarima force-pushed the disable-image-formats branch from 486cdad to 8169f76 Compare December 8, 2024 20:27
@rodarima rodarima merged commit 8169f76 into master Dec 8, 2024
11 checks passed
@rodarima rodarima deleted the disable-image-formats branch December 8, 2024 20:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants