outlyer
/
nautilus-follow-symlink
1
Fork 0
Code Issues Actions Projects Releases 1 Activity

Corrections to build again

This commit is contained in:
Toni Corvera 2024-04-19 00:27:49 +02:00
parent f4069c155e
commit 9a76e33fac
4 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
caja/configure.ac
View File

@ -15,11 +15,17 @@ AC_CONFIG_HEADER(src/config.h)
AC_CONFIG_MACRO_DIR([m4])
dnl default FLAGS, if none provided (note to self: ':=' is not portable)
if test -z "$CPPFLAGS" ; then
CPPFLAGS="-pedantic-errors"
fi
dnl if test -z "$CPPFLAGS" ; then
dnl # NOTE: -pedantic will error when it encounters #warning because it
dnl # it is a GCC extension, nautilus-extension uses #warning
dnl # CPPFLAGS="-pedantic-errors"
dnl fi
if test -z "$CFLAGS" ; then
CFLAGS="-Werror -Winline"
# NOTE: Getting warnings about granular inclusion of nautilus-extension
# headers and deprecated ones, coming from nautilus-extension, not my
# code
#CFLAGS="-Werror -Winline"
CFLAGS="-Winline"
fi
dnl Extra flags always set (might be overridden by user's)
@ -30,6 +36,10 @@ dnl CPPFLAGS="$CPPFLAGS"
CFLAGS="-I\"$PWD/src/caja-layer\" -O2 -Wall -std=gnu99 $CFLAGS"
# -z relro -> read-only relocation ld flag
LDFLAGS="-Wl,--as-needed -Wl,-z,relro $LDFLAGS"
# FIXME: Getting multiple definitions for basic functions like read and getcwd,
# not sure where they come from
# --allow-multiple-definition sounds like a bad idea, though
LDFLAGS="-Wl,--allow-multiple-definition $LDFLAGS"
# libtool, DISABLE_STATIC should go before PROG_LIBTOOL
AM_DISABLE_STATIC

19
nautilus/configure.ac
View File

@ -7,7 +7,6 @@ dnl Cross-compilation
AC_CANONICAL_SYSTEM
AC_CANONICAL_BUILD
AC_ARG_PROGRAM
AM_INIT_AUTOMAKE([1.7 foreign])
AC_REVISION(SVN $Rev$)
@ -15,11 +14,17 @@ AC_CONFIG_HEADER(src/config.h)
AC_CONFIG_MACRO_DIR([m4])
dnl default FLAGS, if none provided (note to self: ':=' is not portable)
if test -z "$CPPFLAGS" ; then
CPPFLAGS="-pedantic-errors"
fi
dnl if test -z "$CPPFLAGS" ; then
dnl # NOTE: -pedantic will error when it encounters #warning because it
dnl # it is a GCC extension, nautilus-extension uses #warning
dnl # CPPFLAGS="-pedantic-errors"
dnl fi
if test -z "$CFLAGS" ; then
CFLAGS="-Werror -Winline"
# NOTE: Getting warnings about granular inclusion of nautilus-extension
# headers and deprecated ones, coming from nautilus-extension, not my
# code
#CFLAGS="-Werror -Winline"
CFLAGS="-Winline"
fi
dnl Extra flags always set (might be overridden by user's)
@ -30,6 +35,10 @@ dnl CPPFLAGS="$CPPFLAGS"
CFLAGS="-O2 -Wall -std=gnu99 $CFLAGS"
# -z relro -> read-only relocation ld flag
LDFLAGS="-Wl,--as-needed -Wl,-z,relro $LDFLAGS"
# FIXME: Getting multiple definitions for basic functions like read and getcwd,
# not sure where they come from
# --allow-multiple-definition sounds like a bad idea, though
LDFLAGS="-Wl,--allow-multiple-definition $LDFLAGS"
# libtool, DISABLE_STATIC should go before PROG_LIBTOOL
AM_DISABLE_STATIC

2
nautilus/src/follow-symlink.c
View File

@ -149,7 +149,7 @@ fsl_get_background_items(NautilusMenuProvider * provider __UNUSED,
}
gboolean file_is_directory (const gpointer const file_data)
gboolean file_is_directory (const gpointer file_data)
{
TRACE();

2
nautilus/src/follow-symlink.h
View File

@ -61,7 +61,7 @@ static inline GList * fsl_get_items_impl(GtkWidget *,
static NautilusMenuItem * fsl_menu_item_new(GdkScreen *, gboolean, const gchar *);
static inline __pure gboolean file_is_directory(const gpointer const);
static inline __pure gboolean file_is_directory(const gpointer);
static gsize printf_string_upper_bound(const gchar *, ...);